pidgin3: comparison src/conversation.c

-:c281356d8eda
+:050506d3945f
 #include "pixmaps/oneeye.xpm"
 #include "pixmaps/crazy4.xpm"
 #include "pixmaps/mrt.xpm"
 #include "pixmaps/download.xpm"
+static GtkTooltips *tabtips = NULL;
 static gchar *ispell_cmd[] = { "ispell", "-a", NULL };
 int state_lock = 0;
 GdkPixmap *dark_icon_pm = NULL;
 */
 void rm_log(struct log_conversation *a)
 {
 	struct conversation *cnv = find_conversation(a->name);
-	char buf[128];
 	log_conversations = g_list_remove(log_conversations, a);
 	save_prefs();
-	if (cnv) {
+	if (cnv && !(im_options & OPT_IM_ONE_WINDOW))
-		if (!(logging_options & OPT_LOG_ALL))
+		set_convo_title(cnv);
-			g_snprintf(buf, sizeof(buf), CONVERSATION_TITLE, cnv->name);
-		else
-			g_snprintf(buf, sizeof(buf), LOG_CONVERSATION_TITLE, cnv->name);
-		if (!(im_options & OPT_IM_ONE_WINDOW))
-			gtk_window_set_title(GTK_WINDOW(cnv->window), buf);
-	}
 }
 struct log_conversation *find_log_info(char *name)
 {
 	char *pname = g_malloc(1024);
 	if (cnv->gc == c)
 		return;
 	cnv->gc = c;
+	set_convo_title(cnv);
 	update_buttons_by_protocol(cnv);
 	update_icon(cnv);
 	update_checkbox(cnv);
 }
 	if (c->gc == gc)
 		return;
 	c->gc = gc;
+	set_convo_title(c);
 	update_buttons_by_protocol(c);
 	update_icon(c);
 	update_checkbox(c);
 }
 void show_conv(struct conversation *c)
 {
 	GtkWidget *win;
 	GtkWidget *cont;
-	char buf[256];
 	GtkWidget *text;
 	GtkWidget *sw;
 	GtkWidget *send;
 	GtkWidget *info;
 	GtkWidget *warn;
 	c->hasbg = 0;
 	c->fgcol = fgcolor;
 	c->hasfg = 0;
 	if (im_options & OPT_IM_ONE_WINDOW) {
+		GtkWidget *page;
 		if (!all_convos) {
 			win = all_convos = c->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 			gtk_window_set_wmclass(GTK_WINDOW(win), "conversation", "Gaim");
 			gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, FALSE);
 			gtk_container_border_width(GTK_CONTAINER(win), 0);
 			gtk_window_set_title(GTK_WINDOW(win), _("Gaim - Conversations"));
 			gtk_signal_connect(GTK_OBJECT(win), "delete_event",
 					   GTK_SIGNAL_FUNC(delete_all_convo), NULL);
 			convo_notebook = gtk_notebook_new();
+			if (!tabtips) {
+				tabtips = gtk_tooltips_new();
+				if (!(im_options & OPT_IM_ALIAS_TAB))
+					gtk_tooltips_disable(tabtips);
+			}
 			if (im_options & OPT_IM_SIDE_TAB) {
 				if (im_options & OPT_IM_BR_TAB) {
 					gtk_notebook_set_tab_pos(GTK_NOTEBOOK(convo_notebook),
 								 GTK_POS_RIGHT);
 				} else {
 		} else
 			win = c->window = all_convos;
 		cont = gtk_vbox_new(FALSE, 5);
 		gtk_container_set_border_width(GTK_CONTAINER(cont), 5);
+		/* this doesn't actually matter since we're resetting it once we're out of the if/else */
 		gtk_notebook_append_page(GTK_NOTEBOOK(convo_notebook), cont, gtk_label_new(c->name));
 		gtk_widget_show(cont);
+		page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(convo_notebook),
+						 g_list_index(conversations, c));
+		page = gtk_notebook_get_tab_label(GTK_NOTEBOOK(convo_notebook), page);
+		gtk_tooltips_set_tip(tabtips, page->parent, c->name, c->name);
 	} else {
 		cont = win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 		c->window = win;
 		gtk_object_set_user_data(GTK_OBJECT(win), c);
 		gtk_window_set_wmclass(GTK_WINDOW(win), "conversation", "Gaim");
 		gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, TRUE);
 		gtk_container_border_width(GTK_CONTAINER(win), 10);
 		gtk_widget_realize(win);
 		aol_icon(win->window);
-		if ((find_log_info(c->name)) || ((logging_options & OPT_LOG_ALL)))
-			 g_snprintf(buf, sizeof(buf), LOG_CONVERSATION_TITLE, c->name);
-		else
-			g_snprintf(buf, sizeof(buf), CONVERSATION_TITLE, c->name);
-		gtk_window_set_title(GTK_WINDOW(win), buf);
 		gtk_signal_connect(GTK_OBJECT(win), "delete_event",
 				   GTK_SIGNAL_FUNC(delete_event_convo), c);
 	}
+	set_convo_title(c);
 	paned = gtk_vpaned_new();
 	gtk_paned_set_gutter_size(GTK_PANED(paned), 15);
 	gtk_container_add(GTK_CONTAINER(cont), paned);
 	gtk_widget_show(paned);
 		convo_notebook = NULL;
 		conversations = m;
 	}
 }
-void set_convo_tab_label(struct conversation *c, char *text)
+void set_convo_title(struct conversation *c)
 {
-	gtk_label_set_text(GTK_LABEL(gtk_notebook_get_tab_label(GTK_NOTEBOOK(convo_notebook),
+	struct buddy *b;
-								gtk_notebook_get_nth_page(GTK_NOTEBOOK
+	char *text;
-											  (convo_notebook),
+	int index;
-											  g_list_index
+	GtkNotebook *nb;
-											  (conversations,
-											   c)))), text);
+	if (!convo_notebook) {
+		char buf[256];
+		if ((find_log_info(c->name)) || (logging_options & OPT_LOG_ALL))
+			g_snprintf(buf, sizeof(buf), LOG_CONVERSATION_TITLE, c->name);
+		else
+			g_snprintf(buf, sizeof(buf), CONVERSATION_TITLE, c->name);
+		gtk_window_set_title(GTK_WINDOW(c->window), buf);
+		return;
+	}
+	if ((im_options & OPT_IM_ALIAS_TAB) && c->gc && ((b = find_buddy(c->gc, c->name)) != NULL))
+		text = b->show;
+	else
+		text = c->name;
+	nb = GTK_NOTEBOOK(convo_notebook);
+	index = g_list_index(conversations, c);
+	gtk_notebook_set_tab_label_text(nb, gtk_notebook_get_nth_page(nb, index), text);
+}
+void set_convo_titles()
+{
+	GList *c = conversations;
+	while (c) {
+		set_convo_title(c->data);
+		c = c->next;
+	}
 }
 void raise_convo_tab(struct conversation *c)
 {
 	gtk_notebook_set_page(GTK_NOTEBOOK(convo_notebook), g_list_index(conversations, c));

Mercurial > pidgin3 / file comparison

comparison: src/conversation.c

src/conversation.c