cpw.qulogic.gtk3-required: 5660a083: GtkStatusIcon no longer has a blinking p...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 5660a083fd1b9e8ce818107a8b8963a5de80bfd9
Parent:   94fbc370a306e01e8929b57a03130d66410406fd
Author:   qulogic at pidgin.im
Date:     12/23/11 04:27:41
Branch:   im.pidgin.cpw.qulogic.gtk3-required
URL: http://d.pidgin.im/viewmtn/revision/info/5660a083fd1b9e8ce818107a8b8963a5de80bfd9

Changelog: 

GtkStatusIcon no longer has a blinking property in GTK+-3.0.
Also, gtk_status_icon_set_tooltip was previously replaced by
gtk_status_icon_set_tooltip_text in GTK+ 2.16.

Changes against parent 94fbc370a306e01e8929b57a03130d66410406fd

  patched  pidgin/gtkdocklet.c

-------------- next part --------------
============================================================
--- pidgin/gtkdocklet.c	67e3ea19314c995da942f9f0e04f563aabe143df
+++ pidgin/gtkdocklet.c	b56eef58d7bcffb8f0f60ecf3d3278d2a755bdc3
@@ -104,12 +104,6 @@ docklet_gtk_status_update_icon(PurpleSta
 	if (icon_name) {
 		gtk_status_icon_set_from_icon_name(docklet, icon_name);
 	}
-
-	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/docklet/blink")) {
-		gtk_status_icon_set_blinking(docklet, (pending && !connecting));
-	} else if (gtk_status_icon_get_blinking(docklet)) {
-		gtk_status_icon_set_blinking(docklet, FALSE);
-	}
 }
 
 static gboolean
@@ -218,7 +212,11 @@ docklet_update_status(void)
 		if (tooltip_text->len > 0)
 			tooltip_text = g_string_truncate(tooltip_text, tooltip_text->len - 1);
 
+#if GTK_CHECK_VERSION(2,16,0)
+		gtk_status_icon_set_tooltip_text(docklet, tooltip_text->str);
+#else
 		gtk_status_icon_set_tooltip(docklet, tooltip_text->str);
+#endif
 
 		g_string_free(tooltip_text, TRUE);
 		g_list_free(convs);
@@ -226,7 +224,11 @@ docklet_update_status(void)
 	} else {
 		char *tooltip_text = g_strconcat(PIDGIN_NAME, " - ",
 			purple_savedstatus_get_title(saved_status), NULL);
+#if GTK_CHECK_VERSION(2,16,0)
+		gtk_status_icon_set_tooltip_text(docklet, tooltip_text);
+#else
 		gtk_status_icon_set_tooltip(docklet, tooltip_text);
+#endif
 		g_free(tooltip_text);
 	}