comparison: pidgin/gtkdocklet.c
pidgin/gtkdocklet.c
- changeset 23869
- e650ca347f69
- parent 23848
- d017d45e3dcf
- child 23870
- de158d6a6c24
equal
deleted
inserted
replaced
| 23868:ed811e1aea80 | 23869:e650ca347f69 |
|---|---|
| 93 | 93 |
| 94 l_im = pidgin_conversations_find_unseen_list(PURPLE_CONV_TYPE_IM, | 94 l_im = pidgin_conversations_find_unseen_list(PURPLE_CONV_TYPE_IM, |
| 95 PIDGIN_UNSEEN_TEXT, | 95 PIDGIN_UNSEEN_TEXT, |
| 96 FALSE, max); | 96 FALSE, max); |
| 97 | 97 |
| 98 /* Short circuit if we have our information already */ | |
| 99 if (max == 1 && l_im != NULL) | |
| 100 return l_im; | |
| 101 | |
| 98 l_chat = pidgin_conversations_find_unseen_list(PURPLE_CONV_TYPE_CHAT, | 102 l_chat = pidgin_conversations_find_unseen_list(PURPLE_CONV_TYPE_CHAT, |
| 99 PIDGIN_UNSEEN_NICK, | 103 PIDGIN_UNSEEN_NICK, |
| 100 FALSE, max); | 104 FALSE, max); |
| 101 | 105 |
| 102 if (l_im != NULL && l_chat != NULL) | 106 if (l_im != NULL && l_chat != NULL) |
| 628 | 632 |
| 629 g_list_free(actions); | 633 g_list_free(actions); |
| 630 } | 634 } |
| 631 | 635 |
| 632 | 636 |
| 637 | |
| 633 static void | 638 static void |
| 634 docklet_plugin_actions(GtkWidget *menu) | 639 docklet_plugin_actions(GtkWidget *menu) |
| 635 { | 640 { |
| 636 GtkWidget *menuitem, *submenu; | 641 GtkWidget *menuitem, *submenu; |
| 637 PurplePlugin *plugin = NULL; | 642 PurplePlugin *plugin = NULL; |
| 663 c++; | 668 c++; |
| 664 } | 669 } |
| 665 if(c>0) | 670 if(c>0) |
| 666 pidgin_separator(menu); | 671 pidgin_separator(menu); |
| 667 } | 672 } |
| 668 | |
| 669 static void | 673 static void |
| 670 docklet_menu(void) | 674 docklet_menu(void) |
| 671 { | 675 { |
| 672 static GtkWidget *menu = NULL; | 676 static GtkWidget *menu = NULL; |
| 673 GtkWidget *menuitem; | 677 GtkWidget *menuitem; |
