# HG changeset patch # User Marcus Lundblad # Date 1290976580 0 # Node ID ab33826dc1798aa3c017c6474771823997b9429a # Parent a3bd979c9ce47fdf631dba6631ba3019dbc364bc GtkDocklet doesn't have a blinking property anymore, so remove this option... diff -r a3bd979c9ce4 -r ab33826dc179 pidgin/gtkdocklet-gtk.c --- a/pidgin/gtkdocklet-gtk.c Thu Nov 25 22:30:18 2010 +0000 +++ b/pidgin/gtkdocklet-gtk.c Sun Nov 28 20:36:20 2010 +0000 @@ -51,9 +51,6 @@ 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 @@ 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 diff -r a3bd979c9ce4 -r ab33826dc179 pidgin/gtkdocklet.c --- a/pidgin/gtkdocklet.c Thu Nov 25 22:30:18 2010 +0000 +++ b/pidgin/gtkdocklet.c Sun Nov 28 20:36:20 2010 +0000 @@ -210,12 +210,6 @@ 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 -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 @@ 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 */