Mercurial > pidgin.yaz

changeset 21399:d2bd7eae1c2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove padding and size-grouping from buttons in minidialogs to save horizontal space.
author Will Thompson <will.thompson@collabora.co.uk>
date Sat, 03 Nov 2007 14:35:09 +0000
parents 0a7cccd6d081
children cb9e962d4f7f
files pidgin/gtkblist.c pidgin/gtkutils.c
diffstat 2 files changed, 5 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkblist.c	Sat Nov 03 14:06:24 2007 +0000
+++ b/pidgin/gtkblist.c	Sat Nov 03 14:35:09 2007 +0000
@@ -4495,7 +4495,7 @@
 	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 @@
 {
 	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 @@
 	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);
--- a/pidgin/gtkutils.c	Sat Nov 03 14:06:24 2007 +0000
+++ b/pidgin/gtkutils.c	Sat Nov 03 14:35:09 2007 +0000
@@ -2922,7 +2922,6 @@
 	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 @@
 				    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 @@
 	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 @@
 		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 @@
 		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);