comparison: pidgin/gtkdocklet-gtk.c
pidgin/gtkdocklet-gtk.c
- changeset 31308
- 35817b8ced65
- parent 31294
- 73607ab89c6f
- child 31474
- 2e78685c09e0
- child 32414
- 8c5d1edf9da2
equal
deleted
inserted
replaced
| 31307:33ec396b9f40 | 31308:35817b8ced65 |
|---|---|
| 52 * loaded so that it can embed automatically if/when a notification | 52 * loaded so that it can embed automatically if/when a notification |
| 53 * area becomes available. | 53 * area becomes available. |
| 54 */ | 54 */ |
| 55 purple_debug_info("docklet", "failed to embed within timeout\n"); | 55 purple_debug_info("docklet", "failed to embed within timeout\n"); |
| 56 pidgin_docklet_remove(); | 56 pidgin_docklet_remove(); |
| 57 purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/docklet/gtk/embedded", FALSE); | |
| 57 | 58 |
| 58 embed_timeout = 0; | 59 embed_timeout = 0; |
| 59 return FALSE; | 60 return FALSE; |
| 60 } | 61 } |
| 61 | 62 |
| 253 | 254 |
| 254 void | 255 void |
| 255 docklet_ui_init(void) | 256 docklet_ui_init(void) |
| 256 { | 257 { |
| 257 pidgin_docklet_set_ui_ops(&ui_ops); | 258 pidgin_docklet_set_ui_ops(&ui_ops); |
| 259 | |
| 260 purple_prefs_add_none(PIDGIN_PREFS_ROOT "/docklet/gtk"); | |
| 261 if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/docklet/x11/embedded")) { | |
| 262 purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/docklet/gtk/embedded", TRUE); | |
| 263 purple_prefs_remove(PIDGIN_PREFS_ROOT "/docklet/x11/embedded"); | |
| 264 } else { | |
| 265 purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/docklet/gtk/embedded", FALSE); | |
| 266 } | |
| 267 | |
| 258 gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), | 268 gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), |
| 259 DATADIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S "pidgin" G_DIR_SEPARATOR_S "tray"); | 269 DATADIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S "pidgin" G_DIR_SEPARATOR_S "tray"); |
| 260 } | 270 } |
| 271 |
