Mercurial > pidgin

changeset 21412:2f818256ae62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove a redundant hbox around PidginMiniDialog's description label.
author Will Thompson <will.thompson@collabora.co.uk>
date Mon, 05 Nov 2007 01:29:11 +0000
parents b089fd1ad059
children ccceac5e1976
files pidgin/minidialog.c
diffstat 1 files changed, 6 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/minidialog.c	Mon Nov 05 01:28:20 2007 +0000
+++ b/pidgin/minidialog.c	Mon Nov 05 01:29:11 2007 +0000
@@ -49,7 +49,6 @@
 	GtkImage *icon;
 	GtkBox *title_box;
 	GtkLabel *title;
-	GtkBox *desc_box;
 	GtkLabel *desc;
 	GtkBox *buttons;
 } PidginMiniDialogPrivate;
@@ -226,12 +225,12 @@
 		g_free(desc_esc);
 		g_free(desc_markup);
 
-		gtk_widget_show_all(GTK_WIDGET(priv->desc_box));
+		gtk_widget_show(GTK_WIDGET(priv->desc));
 	}
 	else
 	{
 		gtk_label_set_text(priv->desc, NULL);
-		gtk_widget_hide_all(GTK_WIDGET(priv->desc_box));
+		gtk_widget_hide(GTK_WIDGET(priv->desc));
 	}
 }
 
@@ -323,7 +322,7 @@
 	priv->icon = GTK_IMAGE(gtk_image_new());
 	gtk_misc_set_alignment(GTK_MISC(priv->icon), 0, 0);
 
-	priv->title = GTK_LABEL(gtk_label_new(""));
+	priv->title = GTK_LABEL(gtk_label_new(NULL));
 	/* TODO: update this request when /blist/width updates.  Also, 25 is
 	 * magic.
 	 */
@@ -335,8 +334,7 @@
 	gtk_box_pack_start(priv->title_box, GTK_WIDGET(priv->icon), FALSE, FALSE, 0);
 	gtk_box_pack_start(priv->title_box, GTK_WIDGET(priv->title), TRUE, TRUE, 0);
 
-	priv->desc_box = GTK_BOX(gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE));
-	priv->desc = GTK_LABEL(gtk_label_new(""));
+	priv->desc = GTK_LABEL(gtk_label_new(NULL));
 	/* TODO: update this request when /blist/width updates.  Also, 25 is
 	 * magic.
 	 */
@@ -344,18 +342,16 @@
 		purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/width")-25, -1);
 	gtk_label_set_line_wrap(priv->desc, TRUE);
 	gtk_misc_set_alignment(GTK_MISC(priv->desc), 0, 0);
-	gtk_box_pack_start(priv->desc_box, GTK_WIDGET(priv->desc),
-		TRUE, TRUE, 0);
 
 	self->contents = GTK_BOX(gtk_vbox_new(FALSE, 0));
 
 	priv->buttons = GTK_BOX(gtk_hbox_new(FALSE, 0));
 
 	gtk_box_pack_start(self_box, GTK_WIDGET(priv->title_box), FALSE, FALSE, 0);
-	gtk_box_pack_start(self_box, GTK_WIDGET(priv->desc_box), FALSE, FALSE, 0);
+	gtk_box_pack_start(self_box, GTK_WIDGET(priv->desc), FALSE, FALSE, 0);
 	gtk_box_pack_start(self_box, GTK_WIDGET(self->contents), TRUE, TRUE, 0);
 	gtk_box_pack_start(self_box, GTK_WIDGET(priv->buttons), FALSE, FALSE, 0);
 
 	gtk_widget_show_all(GTK_WIDGET(self));
-	gtk_widget_hide_all(GTK_WIDGET(priv->desc_box));
+	gtk_widget_hide(GTK_WIDGET(priv->desc));
 }