im.pidgin.cpw.resiak.disconnectreason: 009ea1fb8f4b70b41d13daad8cfe478887558cbd
resiak at soc.pidgin.im
resiak at soc.pidgin.im
Sat Nov 3 13:11:41 EDT 2007
-----------------------------------------------------------------
Revision: 009ea1fb8f4b70b41d13daad8cfe478887558cbd
Ancestor: d6b6fd3147e0be73ca91e14840bdc32c2517a1e5
Author: resiak at soc.pidgin.im
Date: 2007-11-03T14:35:09
Branch: im.pidgin.cpw.resiak.disconnectreason
Modified files:
pidgin/gtkblist.c pidgin/gtkutils.c
ChangeLog:
Remove padding and size-grouping from buttons in minidialogs to save horizontal
space.
-------------- next part --------------
============================================================
--- pidgin/gtkblist.c 48ec7dde9a485aa3a27f6c8d165bf5585d62ca1e
+++ pidgin/gtkblist.c ed774ec8a919b4de5ecf2949cc84f8aac7d9b9ce
@@ -4495,7 +4495,7 @@ make_elsewhere_minidialog_button(const c
char *button_text =
g_strdup_printf("<span size=\"smaller\">%s</span>", text);
- gtk_container_set_border_width(GTK_CONTAINER(hbox), 3);
+ gtk_container_set_border_width(GTK_CONTAINER(hbox), 0);
g_signal_connect_swapped(G_OBJECT(button), "clicked", callback,
gtkblist);
@@ -4515,7 +4515,6 @@ create_signed_on_elsewhere_minidialog(Pi
{
PidginBuddyListPrivate *priv = PIDGIN_BUDDY_LIST_GET_PRIVATE(gtkblist);
GtkWidget *dialog, *vbox, *hbox, *label, *img, *button;
- GtkSizeGroup *sg;
if(priv->signed_on_elsewhere_minidialog)
return;
@@ -4548,18 +4547,15 @@ create_signed_on_elsewhere_minidialog(Pi
gtk_box_pack_start(GTK_BOX(dialog), vbox, FALSE, FALSE, 0);
/* HBox to hold buttons */
- hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
- sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
+ hbox = gtk_hbox_new(FALSE, 0);
button = make_elsewhere_minidialog_button(_("Re-enable"),
(GCallback) reconnect_elsewhere_accounts);
gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
- gtk_size_group_add_widget(sg, button);
button = make_elsewhere_minidialog_button(_("Ignore"),
(GCallback) ignore_elsewhere_accounts);
gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
- gtk_size_group_add_widget(sg, button);
gtk_box_pack_start(GTK_BOX(dialog), hbox, FALSE, FALSE, 0);
pidgin_blist_add_alert(dialog);
============================================================
--- pidgin/gtkutils.c 048ff8179650132f8fbb52a9977e5a6719a409b8
+++ pidgin/gtkutils.c 6cedb555ac69d893722d74c0b8d88c117f357edf
@@ -2922,7 +2922,6 @@ pidgin_make_mini_dialog(PurpleConnection
GtkWidget *label;
GtkWidget *button;
GtkWidget *img = NULL;
- GtkSizeGroup *sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
char label_text[2048];
const char *button_text;
GCallback callback;
@@ -2947,7 +2946,7 @@ pidgin_make_mini_dialog(PurpleConnection
PURPLE_CALLBACK(connection_signed_off_cb), NULL);
}
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
gtk_container_add(GTK_CONTAINER(vbox), hbox);
if (img != NULL)
@@ -2969,7 +2968,7 @@ pidgin_make_mini_dialog(PurpleConnection
gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
- hbox2 = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+ hbox2 = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox2, FALSE, FALSE, 0);
va_start(args, user_data);
@@ -2982,7 +2981,7 @@ pidgin_make_mini_dialog(PurpleConnection
g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy), vbox);
hbox = gtk_hbox_new(FALSE, 0);
gtk_container_add(GTK_CONTAINER(button), hbox);
- gtk_container_set_border_width(GTK_CONTAINER(hbox), 3);
+ gtk_container_set_border_width(GTK_CONTAINER(hbox), 0);
g_snprintf(label_text, sizeof(label_text),
"<span size=\"smaller\">%s</span>", button_text);
label = gtk_label_new(NULL);
@@ -2990,7 +2989,6 @@ pidgin_make_mini_dialog(PurpleConnection
gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5);
gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
gtk_box_pack_end(GTK_BOX(hbox2), button, FALSE, FALSE, 0);
- gtk_size_group_add_widget(sg, button);
}
va_end(args);
More information about the Commits
mailing list