pidgin: e6d5f823: I assume this check was backwards, since...
qulogic at pidgin.im
qulogic at pidgin.im
Tue Sep 6 14:42:43 EDT 2011
----------------------------------------------------------------------
Revision: e6d5f823c4caa7144f24e6c71090dcf9b87528b0
Parent: bc0376c8790c1b7246ed6e14d44874b64dffab7b
Author: qulogic at pidgin.im
Date: 09/06/11 14:38:01
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e6d5f823c4caa7144f24e6c71090dcf9b87528b0
Changelog:
I assume this check was backwards, since embedding should be used
on !Windows. Also, fix a warning when the function's not used.
Changes against parent bc0376c8790c1b7246ed6e14d44874b64dffab7b
patched pidgin/gtkdocklet.c
-------------- next part --------------
============================================================
--- pidgin/gtkdocklet.c a68bafdc81add7fdb3836838edc5ddcfc868514c
+++ pidgin/gtkdocklet.c c663c0d1dbf37dde4c0cb01766504ad7ca12b3d7
@@ -858,6 +858,7 @@ docklet_gtk_recreate_cb(gpointer data)
return FALSE;
}
+#ifndef _WIN32
static gboolean
docklet_gtk_embed_timeout_cb(gpointer data)
{
@@ -890,6 +891,7 @@ docklet_gtk_embed_timeout_cb(gpointer da
return TRUE;
#endif
}
+#endif
#if GTK_CHECK_VERSION(2,12,0)
static gboolean
@@ -1005,7 +1007,7 @@ docklet_gtk_status_create(gboolean recre
*/
if (!recreate) {
pidgin_docklet_embedded();
-#ifdef _WIN32
+#ifndef _WIN32
#if GTK_CHECK_VERSION(2,12,0)
if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/docklet/gtk/embedded")) {
embed_timeout = purple_timeout_add_seconds(LONG_EMBED_TIMEOUT, docklet_gtk_embed_timeout_cb, NULL);
More information about the Commits
mailing list