pidgin3: comparison pidgin/gtkdocklet.c

-:2c65626d1d78
+:749cb2af2e40
 #define DOCKLET_TOOLTIP_LINE_LIMIT 5
 #endif
 /* globals */
 static struct docklet_ui_ops *ui_ops = NULL;
-static DockletStatus status = DOCKLET_STATUS_OFFLINE;
+static PurpleStatusPrimitive status = PURPLE_STATUS_OFFLINE;
+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;
 	static gboolean blinked = FALSE;
 	gboolean ret = FALSE; /* by default, don't keep blinking */
 	blinked = !blinked;
-	switch (status) {
+	if(pending && !connecting) {
-		case DOCKLET_STATUS_PENDING:
+		if (blinked) {
-			if (blinked) {
+			if (ui_ops && ui_ops->blank_icon)
-				if (ui_ops && ui_ops->blank_icon)
+				ui_ops->blank_icon();
-					ui_ops->blank_icon();
+		} else {
-			} else {
+			pidgin_docklet_update_icon();
-				if (ui_ops && ui_ops->update_icon)
+		}
-					ui_ops->update_icon(status);
+		ret = TRUE; /* keep blinking */
-			}
+	} else {
-			ret = TRUE; /* keep blinking */
+		docklet_blinking_timer = 0;
-			break;
+		blinked = FALSE;
-		default:
-			docklet_blinking_timer = 0;
-			blinked = FALSE;
-			break;
 	}
 	return ret;
 }
 docklet_update_status()
 {
 	GList *convs, *l;
 	int count;
 	PurpleSavedStatus *saved_status;
-	PurpleStatusPrimitive prim;
+	PurpleStatusPrimitive newstatus = PURPLE_STATUS_OFFLINE;
-	DockletStatus newstatus = DOCKLET_STATUS_OFFLINE;
+	gboolean newpending = FALSE, newconnecting = FALSE;
-	gboolean pending = FALSE, connecting = FALSE;
 	/* get the current savedstatus */
 	saved_status = purple_savedstatus_get_current();
 	/* determine if any ims have unseen messages */
 		g_list_free(convs);
 		return FALSE;
 	}
 	if (convs != NULL) {
-		pending = TRUE;
+		newpending = TRUE;
 		/* set tooltip if messages are pending */
 		if (ui_ops->set_tooltip) {
 			GString *tooltip_text = g_string_new("");
 			for (l = convs, count = 0 ; l != NULL ; l = l->next, count++) {
 		if (purple_account_is_disconnected(account))
 			continue;
 		account_status = purple_account_get_active_status(account);
 		if (purple_account_is_connecting(account))
-			connecting = TRUE;
+			newconnecting = TRUE;
 	}
-	prim = purple_savedstatus_get_type(saved_status);
+	newstatus = purple_savedstatus_get_type(saved_status);
-	if (pending)
-		newstatus = DOCKLET_STATUS_PENDING;
-	else if (connecting)
-		newstatus = DOCKLET_STATUS_CONNECTING;
-	else if (prim == PURPLE_STATUS_UNAVAILABLE)
-		newstatus = DOCKLET_STATUS_BUSY;
-	else if (prim == PURPLE_STATUS_AWAY)
-		newstatus = DOCKLET_STATUS_AWAY;
-	else if (prim == PURPLE_STATUS_EXTENDED_AWAY)
-		newstatus = DOCKLET_STATUS_XA;
-	else if (prim == PURPLE_STATUS_OFFLINE)
-		newstatus = DOCKLET_STATUS_OFFLINE;
-	else if (prim == PURPLE_STATUS_INVISIBLE)
-		newstatus = DOCKLET_STATUS_INVISIBLE;
-	else
-		newstatus = DOCKLET_STATUS_AVAILABLE;
 	/* update the icon if we changed status */
-	if (status != newstatus) {
+	if (status != newstatus || pending!=newpending || connecting!=newconnecting) {
 		status = newstatus;
+		pending = newpending;
-		if (ui_ops && ui_ops->update_icon)
+		connecting = newconnecting;
-			ui_ops->update_icon(status);
+		pidgin_docklet_update_icon();
 		/* and schedule the blinker function if messages are pending */
-		if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/docklet/blink") &&
+		if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/docklet/blink")
-		    status == DOCKLET_STATUS_PENDING
+			&& pending && !connecting && docklet_blinking_timer == 0) {
-		    && 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 */
 	g_signal_connect(G_OBJECT(menuitem), "toggled", G_CALLBACK(docklet_toggle_blist), NULL);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 	menuitem = gtk_menu_item_new_with_label(_("Unread Messages"));
-	if (status == DOCKLET_STATUS_PENDING) {
+	if (pending) {
 		GtkWidget *submenu = gtk_menu_new();
 		GList *l = get_pending_list(0);
 		if (l == NULL) {
 			gtk_widget_set_sensitive(menuitem, FALSE);
 			purple_debug_warning("docklet",
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 	pidgin_separator(menu);
 	menuitem = pidgin_new_item_from_stock(menu, _("New Message..."), PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, G_CALLBACK(pidgin_dialogs_im), NULL, 0, 0, NULL);
-	if (status == DOCKLET_STATUS_OFFLINE)
+	if (status == PURPLE_STATUS_OFFLINE)
 		gtk_widget_set_sensitive(menuitem, FALSE);
 	menuitem = docklet_status_submenu();
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 	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);
-	/* TODO: need a submenu to change status, this needs to "link"
-	 * to the status in the buddy list gtkstatusbox
-	 */
 	pidgin_new_item_from_stock(menu, _("Quit"), GTK_STOCK_QUIT, G_CALLBACK(purple_core_quit), NULL, 0, 0, NULL);
 #ifdef _WIN32
 	g_signal_connect(menu, "leave-notify-event", G_CALLBACK(docklet_menu_leave_enter), NULL);
 /**************************************************************************
 * public api for ui_ops
 **************************************************************************/
 void
+pidgin_docklet_update_icon()
+{
+	if (ui_ops && ui_ops->update_icon)
+		ui_ops->update_icon(status, connecting, pending);
+}
+void
 pidgin_docklet_clicked(int button_type)
 {
 	switch (button_type) {
 		case 1:
-			if (status == DOCKLET_STATUS_PENDING) {
+			if (pending) {
 				GList *l = get_pending_list(1);
 				if (l != NULL) {
 					purple_conversation_present((PurpleConversation *)l->data);
 					g_list_free(l);
 				}
 		pidgin_blist_visibility_manager_add();
 		visibility_manager = TRUE;
 	}
 	visible = TRUE;
 	docklet_update_status();
-	if (ui_ops && ui_ops->update_icon)
+	pidgin_docklet_update_icon();
-		ui_ops->update_icon(status);
 }
 void
 pidgin_docklet_remove()
 {
 		if (docklet_blinking_timer) {
 			g_source_remove(docklet_blinking_timer);
 			docklet_blinking_timer = 0;
 		}
 		visible = FALSE;
-		status = DOCKLET_STATUS_OFFLINE;
+		status = PURPLE_STATUS_OFFLINE;
 	}
 }
 void
 pidgin_docklet_set_ui_ops(struct docklet_ui_ops *ops)

Mercurial > pidgin3 / file comparison

comparison: pidgin/gtkdocklet.c

pidgin/gtkdocklet.c