Mercurial > pidgin3 / file diff

--- a/pidgin/gtkdocklet.c	Fri Dec 23 09:21:21 2011 +0000
+++ b/pidgin/gtkdocklet.c	Fri Dec 23 09:27:41 2011 +0000
@@ -104,12 +104,6 @@
 	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 @@
 		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 @@
 	} 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);
 	}