Re: [evolution-patches] Fix for 48868

[William Jon McCann <mccannwj pha jhu edu>]

On Sat, 2005-02-12 at 22:52 -0500, William Jon McCann wrote:

>Here is a patch that should work.
>

Scratch that - the property is a 2.6 addition too.  I guess the gtk docs
don't indicate when an object property is added.

Here's a new patch.

Jon

Index: shell/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1496
diff -p -u -r1.1496 ChangeLog
--- shell/ChangeLog	16 Feb 2005 16:18:36 -0000	1.1496
+++ shell/ChangeLog	17 Feb 2005 14:48:21 -0000
@@ -1,3 +1,8 @@
+2005-02-17  William Jon McCann  <mccann jhu edu>
+
+	* e-shell-window.c (setup_offline_toggle): Make offline button scale
+	with font size.  Fixes #48868.
+
 2005-02-10  JP Rosevear  <jpr novell com>
 
 	* e-component-registry.c (query_components): unref the menu icon
Index: shell/e-shell-window.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-window.c,v
retrieving revision 1.30
diff -p -u -r1.30 e-shell-window.c
--- shell/e-shell-window.c	4 Jan 2005 19:58:45 -0000	1.30
+++ shell/e-shell-window.c	17 Feb 2005 14:48:21 -0000
@@ -488,6 +488,8 @@ setup_offline_toggle (EShellWindow *wind
 	EShellWindowPrivate *priv;
 	GtkWidget *toggle;
 	GtkWidget *image;
+	GtkWidget *label;
+	GtkWidget *hbox;
 
 	priv = window->priv;
 
@@ -497,13 +499,16 @@ setup_offline_toggle (EShellWindow *wind
 
 	g_signal_connect (toggle, "clicked",
 			  G_CALLBACK (offline_toggle_clicked_callback), window);
+	hbox = gtk_hbox_new (FALSE, 0);
+	gtk_container_add (GTK_CONTAINER (toggle), hbox);
 
 	image = gtk_image_new_from_pixmap (offline_pixmap, offline_mask);
+	gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
 
-	gtk_container_add (GTK_CONTAINER (toggle), image);
+	label = gtk_label_new ("");
+	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
-	gtk_widget_show (toggle);
-	gtk_widget_show (image);
+	gtk_widget_show_all (toggle);
 
 	priv->offline_toggle       = toggle;
 	priv->offline_toggle_image = image;