comparison: pidgin/gtkdocklet-x11.c
pidgin/gtkdocklet-x11.c
- branch
- next.minor
- changeset 29641
- e54552cf87d8
- parent 29500
- 1e0464dad92b
- child 29706
- 230f2f5eca1e
equal
deleted
inserted
replaced
| 29640:e97688dcc88a | 29641:e54552cf87d8 |
|---|---|
| 32 | 32 |
| 33 #include "eggtrayicon.h" | 33 #include "eggtrayicon.h" |
| 34 #include "gtkdocklet.h" | 34 #include "gtkdocklet.h" |
| 35 #include <gdk/gdkkeysyms.h> | 35 #include <gdk/gdkkeysyms.h> |
| 36 | 36 |
| 37 #if !GTK_CHECK_VERSION(2,10,0) | |
| 38 | |
| 37 #define SHORT_EMBED_TIMEOUT 5000 | 39 #define SHORT_EMBED_TIMEOUT 5000 |
| 38 #define LONG_EMBED_TIMEOUT 15000 | 40 #define LONG_EMBED_TIMEOUT 15000 |
| 39 | 41 |
| 40 /* globals */ | 42 /* globals */ |
| 41 static EggTrayIcon *docklet = NULL; | 43 static EggTrayIcon *docklet = NULL; |
| 350 { | 352 { |
| 351 pidgin_docklet_set_ui_ops(&ui_ops); | 353 pidgin_docklet_set_ui_ops(&ui_ops); |
| 352 purple_prefs_add_none(PIDGIN_PREFS_ROOT "/docklet/x11"); | 354 purple_prefs_add_none(PIDGIN_PREFS_ROOT "/docklet/x11"); |
| 353 purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/docklet/x11/embedded", FALSE); | 355 purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/docklet/x11/embedded", FALSE); |
| 354 } | 356 } |
| 357 | |
| 358 #endif /* !GTK_CHECK_VERSION(2,10,0) */ | |
| 359 |
