pidgin: cce14dc3: Insert an empty widget in chat windows t...

qulogic at pidgin.im qulogic at pidgin.im
Mon May 18 23:50:52 EDT 2009


-----------------------------------------------------------------
Revision: cce14dc372006ab5aec398491d14b3a763843b5c
Ancestor: ac9571d8f4a4810f7a92dfe85fdff917ac7be59c
Author: qulogic at pidgin.im
Date: 2009-05-18T21:05:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cce14dc372006ab5aec398491d14b3a763843b5c

Modified files:
        pidgin/gtkconv.c

ChangeLog: 

Insert an empty widget in chat windows to ensure that the infopane is
correctly sized for chat windows. The correct fix is to put an icon in the
chat window as well, because that would make "Set Custom Icon" consistent
for both the buddy list and the chat window, but PidginConversation is
pretty much stuck until 3.0.

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	8b29b10ff01efc2488460d2b8119d5f748ca4e2b
+++ pidgin/gtkconv.c	eab7a28681c518e05755f3d039763526fdb83f1d
@@ -4637,6 +4637,7 @@ setup_chat_topic(PidginConversation *gtk
 		gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
 		gtkchat->topic_text = gtk_entry_new();
+		gtk_widget_set_size_request(gtkchat->topic_text, -1, BUDDYICON_SIZE_MIN);
 
 		if(prpl_info->set_chat_topic == NULL) {
 			gtk_editable_set_editable(GTK_EDITABLE(gtkchat->topic_text), FALSE);
@@ -4855,7 +4856,19 @@ setup_common_pane(PidginConversation *gt
 	gtk_cell_view_set_displayed_row(GTK_CELL_VIEW(gtkconv->infopane), path);
 	gtk_tree_path_free(path);
 
-	if (!chat) {
+	if (chat) {
+		/* This empty widget is used to ensure that the infopane is consistently
+		   sized for chat windows. The correct fix is to put an icon in the chat
+		   window as well, because that would make "Set Custom Icon" consistent
+		   for both the buddy list and the chat window, but PidginConversation
+		   is pretty much stuck until 3.0. */
+		GtkWidget *sizing_vbox;
+		sizing_vbox = gtk_vbox_new(FALSE, 0);
+		gtk_widget_set_size_request(sizing_vbox, -1, BUDDYICON_SIZE_MIN);
+		gtk_box_pack_start(GTK_BOX(gtkconv->infopane_hbox), sizing_vbox, FALSE, FALSE, 0);
+		gtk_widget_show(sizing_vbox);
+	}
+	else {
 		gtkconv->u.im->icon_container = gtk_vbox_new(FALSE, 0);
 
 		if ((buddy = purple_find_buddy(purple_conversation_get_account(conv),


More information about the Commits mailing list