comparison: pidgin/gtkdocklet.c
pidgin/gtkdocklet.c
- changeset 33534
- 97976e12368d
- parent 33529
- 9e16d21d4a6f
- child 33683
- bf243e3394a7
equal
deleted
inserted
replaced
| 33533:f55a5555ee46 | 33534:97976e12368d |
|---|---|
| 139 /* Short circuit if we have our information already */ | 139 /* Short circuit if we have our information already */ |
| 140 if (max == 1 && l_im != NULL) | 140 if (max == 1 && l_im != NULL) |
| 141 return l_im; | 141 return l_im; |
| 142 | 142 |
| 143 l_chat = pidgin_conversations_find_unseen_list(PURPLE_CONV_TYPE_CHAT, | 143 l_chat = pidgin_conversations_find_unseen_list(PURPLE_CONV_TYPE_CHAT, |
| 144 PIDGIN_UNSEEN_NICK, | 144 purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/notification_chat"), |
| 145 FALSE, max); | 145 FALSE, max); |
| 146 | 146 |
| 147 if (l_im != NULL && l_chat != NULL) | 147 if (l_im != NULL && l_chat != NULL) |
| 148 return g_list_concat(l_im, l_chat); | 148 return g_list_concat(l_im, l_chat); |
| 149 else if (l_im != NULL) | 149 else if (l_im != NULL) |
| 1024 purple_prefs_add_none(PIDGIN_PREFS_ROOT "/docklet"); | 1024 purple_prefs_add_none(PIDGIN_PREFS_ROOT "/docklet"); |
| 1025 purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/docklet/blink", FALSE); | 1025 purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/docklet/blink", FALSE); |
| 1026 purple_prefs_add_string(PIDGIN_PREFS_ROOT "/docklet/show", "always"); | 1026 purple_prefs_add_string(PIDGIN_PREFS_ROOT "/docklet/show", "always"); |
| 1027 purple_prefs_connect_callback(docklet_handle, PIDGIN_PREFS_ROOT "/docklet/show", | 1027 purple_prefs_connect_callback(docklet_handle, PIDGIN_PREFS_ROOT "/docklet/show", |
| 1028 docklet_show_pref_changed_cb, NULL); | 1028 docklet_show_pref_changed_cb, NULL); |
| 1029 purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/notification_chat", PIDGIN_UNSEEN_TEXT); | |
| 1029 | 1030 |
| 1030 purple_prefs_add_none(PIDGIN_PREFS_ROOT "/docklet/gtk"); | 1031 purple_prefs_add_none(PIDGIN_PREFS_ROOT "/docklet/gtk"); |
| 1031 if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/docklet/x11/embedded")) { | 1032 if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/docklet/x11/embedded")) { |
| 1032 purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/docklet/gtk/embedded", TRUE); | 1033 purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/docklet/gtk/embedded", TRUE); |
| 1033 purple_prefs_remove(PIDGIN_PREFS_ROOT "/docklet/x11/embedded"); | 1034 purple_prefs_remove(PIDGIN_PREFS_ROOT "/docklet/x11/embedded"); |
