/pidgin/main: 1f676cd20646: Quick merge.

[Elliott Sales de Andrade]

Changeset: 1f676cd20646b5db799a45936325fb008d4e559b
Author:	 Elliott Sales de Andrade <qulogic at pidgin.im>
Date:	 2012-07-23 20:18 -0400
Branch:	 cpw.qulogic.gtk3-required
URL: http://hg.pidgin.im/pidgin/main/rev/1f676cd20646

Description:

Quick merge.

diffstat:

 pidgin/gtkconv.c    |  15 ++++++---------
 pidgin/gtkdocklet.c |  26 --------------------------
 2 files changed, 6 insertions(+), 35 deletions(-)

diffs (96 lines):

diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -1134,7 +1134,6 @@
 	PurpleConversation *conv;
 	PurpleLogType type;
 	PidginBuddyList *gtkblist;
-	GdkCursor *cursor;
 	const char *name;
 	PurpleAccount *account;
 	GSList *buddies;
@@ -1151,10 +1150,8 @@
 
 	gtkblist = pidgin_blist_get_default_gtk_blist();
 
-	cursor = gdk_cursor_new(GDK_WATCH);
-	gdk_window_set_cursor(gtk_widget_get_window(gtkblist->window), cursor);
-	gdk_window_set_cursor(gtk_widget_get_window(win->window), cursor);
-	gdk_cursor_unref(cursor);
+	pidgin_set_cursor(gtkblist->window, GDK_WATCH);
+	pidgin_set_cursor(win->window, GDK_WATCH);
 
 	name = purple_conversation_get_name(conv);
 	account = purple_conversation_get_account(conv);
@@ -1167,8 +1164,8 @@
 		{
 			pidgin_log_show_contact((PurpleContact *)node->parent);
 			g_slist_free(buddies);
-			gdk_window_set_cursor(gtk_widget_get_window(gtkblist->window), NULL);
-			gdk_window_set_cursor(gtk_widget_get_window(win->window), NULL);
+			pidgin_clear_cursor(gtkblist->window);
+			pidgin_clear_cursor(win->window);
 			return;
 		}
 	}
@@ -1176,8 +1173,8 @@
 
 	pidgin_log_show(type, name, account);
 
-	gdk_window_set_cursor(gtk_widget_get_window(gtkblist->window), NULL);
-	gdk_window_set_cursor(gtk_widget_get_window(win->window), NULL);
+	pidgin_clear_cursor(gtkblist->window);
+	pidgin_clear_cursor(win->window);
 }
 
 static void
diff --git a/pidgin/gtkdocklet.c b/pidgin/gtkdocklet.c
--- a/pidgin/gtkdocklet.c
+++ b/pidgin/gtkdocklet.c
@@ -59,7 +59,6 @@
 static gboolean pending = FALSE;
 static gboolean connecting = FALSE;
 static gboolean enable_join_chat = FALSE;
-static guint docklet_blinking_timer = 0;
 static gboolean visible = FALSE;
 static gboolean visibility_manager = FALSE;
 
@@ -106,27 +105,6 @@
 	}
 }
 
-static gboolean
-docklet_blink_icon(gpointer data)
-{
-	static gboolean blinked = FALSE;
-	gboolean ret = FALSE; /* by default, don't keep blinking */
-
-	blinked = !blinked;
-
-	if(pending && !connecting) {
-		if (!blinked) {
-			docklet_gtk_status_update_icon(status, connecting, pending);
-		}
-		ret = TRUE; /* keep blinking */
-	} else {
-		docklet_blinking_timer = 0;
-		blinked = FALSE;
-	}
-
-	return ret;
-}
-
 static GList *
 get_pending_list(guint max)
 {
@@ -819,10 +797,6 @@
 			pidgin_blist_visibility_manager_remove();
 			visibility_manager = FALSE;
 		}
-		if (docklet_blinking_timer) {
-			g_source_remove(docklet_blinking_timer);
-			docklet_blinking_timer = 0;
-		}
 		visible = FALSE;
 		status = PURPLE_STATUS_OFFLINE;
 	}