Mercurial > pidgin
changeset 17033:c28f4593f723
Pack connection error buttons the same way the statusbox is. Fixes #120
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Fri, 11 May 2007 21:25:24 +0000 |
| parents | 8ad7750b0391 |
| children | d2353e780fd5 |
| files | pidgin/gtkblist.c |
| diffstat | 1 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Fri May 11 17:05:59 2007 +0000 +++ b/pidgin/gtkblist.c Fri May 11 21:25:24 2007 +0000 @@ -3957,6 +3957,9 @@ g_free(primary); gtk_widget_destroy(GTK_WIDGET(widget)); g_hash_table_remove(gtkblist->connection_errors, account); + if (gtk_container_get_children(GTK_CONTAINER(gtkblist->error_buttons)) == NULL) { + gtk_widget_hide(gtkblist->error_buttons); + } } /* Add some buttons that show connection errors */ @@ -3977,7 +3980,7 @@ escaped); g_free(escaped); - hbox = gtk_hbox_new(FALSE, 0); + hbox = gtk_hbox_new(FALSE, 6); /* Create the icon */ if ((status_type = purple_account_get_status_type_with_primitive(account, @@ -3987,8 +3990,7 @@ image = gtk_image_new_from_pixbuf(pixbuf); g_object_unref(pixbuf); - gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, - PIDGIN_HIG_BOX_SPACE); + gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0); } } @@ -3999,8 +4001,7 @@ #if GTK_CHECK_VERSION(2,6,0) g_object_set(label, "ellipsize", PANGO_ELLIPSIZE_END, NULL); #endif - gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, - PIDGIN_HIG_BOX_SPACE); + gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); /* Create the actual button and put the icon and text on it */ button = gtk_button_new(); @@ -4011,6 +4012,7 @@ gtk_widget_show_all(button); gtk_box_pack_end(GTK_BOX(gtkblist->error_buttons), button, FALSE, FALSE, 0); + gtk_widget_show_all(gtkblist->error_buttons); } void @@ -4476,7 +4478,8 @@ /* Create an empty vbox used for showing connection errors */ gtkblist->error_buttons = gtk_vbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->error_buttons, FALSE, FALSE, 0); - + gtk_container_set_border_width(GTK_CONTAINER(gtkblist->error_buttons), 3); + /* Add the statusbox */ gtkblist->statusbox = pidgin_status_box_new(); gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->statusbox, FALSE, TRUE, 0); @@ -4573,6 +4576,7 @@ gtkblist); gtk_widget_hide(gtkblist->headline_hbox); + gtk_widget_hide(gtkblist->error_buttons); /* emit our created signal */ purple_signal_emit(handle, "gtkblist-created", list);