cpw.qulogic.gtk3: a6ce17c9: GtkDocklet doesn't have a blinking prope...

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: a6ce17c94a4b50c82e23eaf9ecf778d33758a017
Parent:   150bec91d11fbc7d19853ff0c4d46c7472a15b0a
Author:   malu at pidgin.im
Date:     11/28/10 15:36:20
Branch:   im.pidgin.cpw.qulogic.gtk3
URL: http://d.pidgin.im/viewmtn/revision/info/a6ce17c94a4b50c82e23eaf9ecf778d33758a017

Changelog: 

GtkDocklet doesn't have a blinking property anymore, so remove this option...

Changes against parent 150bec91d11fbc7d19853ff0c4d46c7472a15b0a

  patched  pidgin/gtkdocklet-gtk.c
  patched  pidgin/gtkdocklet.c

-------------- next part --------------
============================================================
--- pidgin/gtkdocklet.c	3210635fd083b949a1fdfc72ee601fa7a518b52f
+++ pidgin/gtkdocklet.c	a35f928f79f0f2cfd3e6fb64b7f4c8764138abc2
@@ -210,12 +210,6 @@ docklet_update_status(void)
 		connecting = newconnecting;
 
 		pidgin_docklet_update_icon();
-
-		/* and schedule the blinker function if messages are pending */
-		if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/docklet/blink")
-			&& pending && !connecting && docklet_blinking_timer == 0) {
-			docklet_blinking_timer = g_timeout_add(500, docklet_blink_icon, NULL);
-		}
 	}
 
 	return FALSE; /* for when we're called by the glib idle handler */
@@ -320,13 +314,6 @@ static void
 }
 
 static void
-docklet_toggle_blink(GtkWidget *toggle, void *data)
-{
-	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/docklet/blink",
-                        gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(toggle)));
-}
-
-static void
 docklet_toggle_blist(GtkWidget *toggle, void *data)
 {
 	purple_blist_set_visible(gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(toggle)));
@@ -736,11 +723,6 @@ docklet_menu(void)
 	g_signal_connect(G_OBJECT(menuitem), "toggled", G_CALLBACK(docklet_toggle_mute), NULL);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-	menuitem = gtk_check_menu_item_new_with_mnemonic(_("_Blink on New Message"));
-	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/docklet/blink"));
-	g_signal_connect(G_OBJECT(menuitem), "toggled", G_CALLBACK(docklet_toggle_blink), NULL);
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
-
 	pidgin_separator(menu);
 
 	/* add plugin actions */
============================================================
--- pidgin/gtkdocklet-gtk.c	c1e1ae9ef06e9460987df302b51f8421ae637088
+++ pidgin/gtkdocklet-gtk.c	66000068ff43b68ad9e30ac52ed1410c158a1db2
@@ -51,9 +51,6 @@ docklet_gtk_status_update_icon(PurpleSta
 docklet_gtk_status_update_icon(PurpleStatusPrimitive status, gboolean connecting, gboolean pending)
 {
 	const gchar *icon_name = NULL;
-  gboolean blinking;
-
-  g_object_get(G_OBJECT(docklet), "blinking", &blinking, NULL);
     
 	switch (status) {
 		case PURPLE_STATUS_OFFLINE:
@@ -84,12 +81,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")) {
-    g_object_set(G_OBJECT(docklet), "blinking", pending && !connecting, NULL);
-	} else if (blinking) {
-		g_object_set(G_OBJECT(docklet), "blinking", FALSE, NULL);
-	}
 }
 
 static void