comparison: pidgin/gtkdocklet.c
pidgin/gtkdocklet.c
- changeset 23870
- de158d6a6c24
- parent 23869
- e650ca347f69
equal
deleted
inserted
replaced
| 23869:e650ca347f69 | 23870:de158d6a6c24 |
|---|---|
| 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 | |
| 102 l_chat = pidgin_conversations_find_unseen_list(PURPLE_CONV_TYPE_CHAT, | 98 l_chat = pidgin_conversations_find_unseen_list(PURPLE_CONV_TYPE_CHAT, |
| 103 PIDGIN_UNSEEN_NICK, | 99 PIDGIN_UNSEEN_NICK, |
| 104 FALSE, max); | 100 FALSE, max); |
| 105 | 101 |
| 106 if (l_im != NULL && l_chat != NULL) | 102 if (l_im != NULL && l_chat != NULL) |
| 632 | 628 |
| 633 g_list_free(actions); | 629 g_list_free(actions); |
| 634 } | 630 } |
| 635 | 631 |
| 636 | 632 |
| 637 | |
| 638 static void | 633 static void |
| 639 docklet_plugin_actions(GtkWidget *menu) | 634 docklet_plugin_actions(GtkWidget *menu) |
| 640 { | 635 { |
| 641 GtkWidget *menuitem, *submenu; | 636 GtkWidget *menuitem, *submenu; |
| 642 PurplePlugin *plugin = NULL; | 637 PurplePlugin *plugin = NULL; |
| 668 c++; | 663 c++; |
| 669 } | 664 } |
| 670 if(c>0) | 665 if(c>0) |
| 671 pidgin_separator(menu); | 666 pidgin_separator(menu); |
| 672 } | 667 } |
| 668 | |
| 673 static void | 669 static void |
| 674 docklet_menu(void) | 670 docklet_menu(void) |
| 675 { | 671 { |
| 676 static GtkWidget *menu = NULL; | 672 static GtkWidget *menu = NULL; |
| 677 GtkWidget *menuitem; | 673 GtkWidget *menuitem; |
