pidgin3: comparison pidgin/gtkconv.c

-:51ea68d3a41a
+:cd9bd951717d
 } InviteBuddyInfo;
 static GtkWidget *invite_dialog = NULL;
 static GtkWidget *warn_close_dialog = NULL;
+static PidginWindow *hidden_convwin = NULL;
 static GList *window_list = NULL;
 /* Lists of status icons at all available sizes for use as window icons */
 static GList *available_list = NULL;
 static GList *away_list = NULL;
 	GdkModifierType state;
 	if (gtkconv == NULL) {
 		pidgin_conv_attach_to_conversation(conv);
 		gtkconv = PIDGIN_CONVERSATION(conv);
+	} else if (gtkconv->win == hidden_convwin) {
+		pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
+		pidgin_conv_placement_place(gtkconv);
 	}
 	pidgin_conv_switch_active_conversation(conv);
 	/* Switch the tab only if the user initiated the event by pressing
 	 * a button or hitting a key. */
 	for (; l != NULL && (max_count == 0 || c < max_count); l = l->next) {
 		PurpleConversation *conv = (PurpleConversation*)l->data;
 		PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
-		if (gtkconv != NULL && gtkconv->active_conv != conv)
+		if(gtkconv == NULL || gtkconv->active_conv != conv)
 			continue;
-		if (gtkconv == NULL) {
-			if (!purple_conversation_get_data(conv, "unseen-count") ||
+		if (gtkconv->unseen_state >= min_state
-				!purple_conversation_get_data(conv, "unseen-state") ||
+			&& (!hidden_only ||
-				GPOINTER_TO_INT(purple_conversation_get_data(conv, "unseen-state"))<min_state)
+				(hidden_only && gtkconv->win == hidden_convwin))) {
-				continue;
 			r = g_list_prepend(r, conv);
 			c++;
-		} else {
-			if (gtkconv->unseen_state >= min_state && !hidden_only) {
-				r = g_list_prepend(r, conv);
-				c++;
-			}
 		}
 	}
 	return r;
 }
 		GtkWidget *icon = gtk_image_new();
 		GdkPixbuf *pbuf = pidgin_conv_get_icon(conv, icon, PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC);
 		GtkWidget *item;
 		gchar *text = g_strdup_printf("%s (%d)",
-				gtkconv ? gtk_label_get_text(GTK_LABEL(gtkconv->tab_label)) : purple_conversation_get_name(conv),
+				gtk_label_get_text(GTK_LABEL(gtkconv->tab_label)),
-				gtkconv ? gtkconv->unseen_count : GPOINTER_TO_INT(purple_conversation_get_data(conv, "unseen-count")));
+				gtkconv->unseen_count);
 		gtk_image_set_from_pixbuf(GTK_IMAGE(icon), pbuf);
 		g_object_unref(pbuf);
 		item = gtk_image_menu_item_new_with_label(text);
 	GList *list;
 	PidginConversation *gtkconv;
 	PurpleConversation *conv;
 	GtkWidget *item;
-	if (win->window == NULL)
+	if (win->window == NULL || win->window == hidden_convwin)
 		return;
 	gtkconv = pidgin_conv_window_get_active_gtkconv(win);
 	if (gtkconv == NULL)
 		return;
 	PurpleConversationType conv_type = purple_conversation_get_type(conv);
 	GtkWidget *pane = NULL;
 	GtkWidget *tab_cont;
 	PurpleBlistNode *convnode;
-	if (hidden)
-		return;
 	if (conv_type == PURPLE_CONV_TYPE_IM && (gtkconv = pidgin_conv_find_gtkconv(conv))) {
 		conv->ui_data = gtkconv;
 		if (!g_list_find(gtkconv->convs, conv))
 			gtkconv->convs = g_list_prepend(gtkconv->convs, conv);
 		pidgin_conv_switch_active_conversation(conv);
 	g_signal_connect_swapped(G_OBJECT(pane), "focus",
 	                         G_CALLBACK(gtk_widget_grab_focus),
 	                         gtkconv->entry);
-	pidgin_conv_placement_place(gtkconv);
+	if (hidden)
+		pidgin_conv_window_add_gtkconv(hidden_convwin, gtkconv);
+	else
+		pidgin_conv_placement_place(gtkconv);
 	if (nick_colors == NULL) {
 		nbr_nick_colors = NUM_NICK_COLORS;
 		nick_colors = generate_nick_colors(&nbr_nick_colors, gtk_widget_get_style(gtkconv->imhtml)->base[GTK_STATE_NORMAL]);
 	}
 }
-#if 0
 static void
 pidgin_conv_new_hidden(PurpleConversation *conv)
 {
 	private_gtkconv_new(conv, TRUE);
 }
-#endif
 void
 pidgin_conv_new(PurpleConversation *conv)
 {
 	private_gtkconv_new(conv, FALSE);
 				   PurpleConversation *conv, PurpleMessageFlags flags)
 {
 	PurpleConversationUiOps *ui_ops = pidgin_conversations_get_conv_ui_ops();
 	/* create hidden conv if hide_new pref is always */
-	/* or if hide_new pref is away and account is away */
+	if (strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "always") == 0)
-	if ((strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "always") == 0) ||
+	{
-		(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away") == 0 &&
+		ui_ops->create_conversation = pidgin_conv_new_hidden;
-		 !purple_status_is_available(purple_account_get_active_status(account)))) {
+		purple_conversation_new(PURPLE_CONV_TYPE_IM, account, sender);
-		if (!conv) {
+		ui_ops->create_conversation = pidgin_conv_new;
-			ui_ops->create_conversation = NULL;
+		return;
-			conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, sender);
+	}
-			purple_conversation_set_ui_ops(conv, NULL);
-			ui_ops->create_conversation = pidgin_conv_new;
+	/* create hidden conv if hide_new pref is away and account is away */
-		} else {
+	if (strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away") == 0 &&
-			/* TODO: update the unseen_state data on the conv here */
+	    !purple_status_is_available(purple_account_get_active_status(account)))
-		}
+	{
-	} else {
+		ui_ops->create_conversation = pidgin_conv_new_hidden;
-		/* new message for an IM */
+		purple_conversation_new(PURPLE_CONV_TYPE_IM, account, sender);
-		if (conv && conv->type == PURPLE_CONV_TYPE_IM)
+		ui_ops->create_conversation = pidgin_conv_new;
-			pidgin_conv_attach_to_conversation(conv);
+		return;
 	}
 }
 static void
 pidgin_conv_destroy(PurpleConversation *conv)
 {
 	PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
-	if (!gtkconv)
-		return;
 	gtkconv->convs = g_list_remove(gtkconv->convs, conv);
 	/* Don't destroy ourselves until all our convos are gone */
 	if (gtkconv->convs) {
 		/* Make sure the destroyed conversation is not the active one */
 static void
 account_status_changed_cb(PurpleAccount *account, PurpleStatus *oldstatus,
 PurpleStatus *newstatus)
 {
-#if 0
 	GList *l;
 	PurpleConversation *conv = NULL;
 	PidginConversation *gtkconv;
 	if(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away")!=0)
 		return;
 	if(purple_status_is_available(oldstatus) || !purple_status_is_available(newstatus))
 		return;
-#endif
+	while ((l = hidden_convwin->gtkconvs) != NULL)
+	{
+		gtkconv = l->data;
+		conv = gtkconv->active_conv;
+		while(l && !purple_status_is_available(
+					purple_account_get_active_status(
+					purple_conversation_get_account(conv))))
+			l = l->next;
+		if (!l)
+			break;
+		pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
+		pidgin_conv_placement_place(gtkconv);
+		/* TODO: do we need to do anything for any other conversations that are in the same gtkconv here?
+		 * I'm a little concerned that not doing so will cause the "pending" indicator in the gtkblist not to be cleared. -DAA*/
+		purple_conversation_update(conv, PURPLE_CONV_UPDATE_UNSEEN);
+	}
 }
 static void
 hide_new_pref_cb(const char *name, PurplePrefType type,
 				 gconstpointer value, gpointer data)
 {
 	GList *l;
+	PurpleConversation *conv = NULL;
+	PidginConversation *gtkconv;
 	gboolean when_away = FALSE;
+	if(!hidden_convwin)
+		return;
 	if(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "always")==0)
 		return;
 	if(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away")==0)
 		when_away = TRUE;
-	for (l = purple_get_conversations(); l; l = l->next)
+	while ((l = hidden_convwin->gtkconvs) != NULL)
 	{
-		PurpleConversation *conv = l->data;
+		gtkconv = l->data;
-		PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
-		if (gtkconv)
+		conv = gtkconv->active_conv;
-			continue;
 		if(when_away && !purple_status_is_available(
 							purple_account_get_active_status(
 							purple_conversation_get_account(conv))))
 			continue;
-		pidgin_conv_attach_to_conversation(conv);
+		pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
+		pidgin_conv_placement_place(gtkconv);
 	}
 }
 static void
 	purple_signal_connect(purple_conversations_get_handle(), "received-im-msg",
 						handle, G_CALLBACK(received_im_msg_cb), NULL);
 	purple_conversations_set_ui_ops(&conversation_ui_ops);
+	hidden_convwin = pidgin_conv_window_new();
+	window_list = g_list_remove(window_list, hidden_convwin);
 	purple_signal_connect(purple_accounts_get_handle(), "account-status-changed",
 handle, PURPLE_CALLBACK(account_status_changed_cb), NULL);
 	/* Callbacks to update a conversation */
 			0, 0, NULL, NULL, gtkconv);
 	if (win->gtkconvs && win->gtkconvs->next == NULL)
 		pidgin_conv_tab_pack(win, win->gtkconvs->data);
-	if (!win->gtkconvs)
+	if (!win->gtkconvs && win != hidden_convwin)
 		pidgin_conv_window_destroy(win);
 }
 PidginConversation *
 pidgin_conv_window_get_gtkconv_at_index(const PidginWindow *win, int index)
 }
 gboolean
 pidgin_conv_is_hidden(PidginConversation *gtkconv)
 {
-	return (gtkconv == NULL);
+	g_return_val_if_fail(gtkconv != NULL, FALSE);
+	return (gtkconv->win == hidden_convwin);
 }
 /* Algorithm from http://www.w3.org/TR/AERT#color-contrast */
 static gboolean
 		*color_count = i;
 	}
 	return colors;
 }

Mercurial > pidgin3 / file comparison

comparison: pidgin/gtkconv.c

pidgin/gtkconv.c