aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorHarish Krishnaswamy <kharish@novell.com>2005-11-15 02:50:44 +0800
committerHarish Krishnaswamy <kharish@src.gnome.org>2005-11-15 02:50:44 +0800
commitc985cb5ff6c9180bd9848f953cb4a7c594b21f29 (patch)
treebd7a1c270944874dada13471ea0d1c77f6ef6b77 /shell
parent79efc40b19f513570d800d2b3fa6293ea794a28d (diff)
downloadgsoc2013-evolution-c985cb5ff6c9180bd9848f953cb4a7c594b21f29.tar
gsoc2013-evolution-c985cb5ff6c9180bd9848f953cb4a7c594b21f29.tar.gz
gsoc2013-evolution-c985cb5ff6c9180bd9848f953cb4a7c594b21f29.tar.bz2
gsoc2013-evolution-c985cb5ff6c9180bd9848f953cb4a7c594b21f29.tar.lz
gsoc2013-evolution-c985cb5ff6c9180bd9848f953cb4a7c594b21f29.tar.xz
gsoc2013-evolution-c985cb5ff6c9180bd9848f953cb4a7c594b21f29.tar.zst
gsoc2013-evolution-c985cb5ff6c9180bd9848f953cb4a7c594b21f29.zip
Revert the previous patch as it distorts the size of the dialog on some
2005-11-14 Harish Krishnaswamy <kharish@novell.com> * e-shell-settings-dialog.c: (set_dialog_size), (e_shell_settings_dialog_init): Revert the previous patch as it distorts the size of the dialog on some displays. svn path=/trunk/; revision=30614
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/e-shell-settings-dialog.c6
2 files changed, 10 insertions, 3 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index cde7ad62d6..e70a59deff 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-14 Harish Krishnaswamy <kharish@novell.com>
+
+ * e-shell-settings-dialog.c: (set_dialog_size),
+ (e_shell_settings_dialog_init): Revert the previous
+ patch as it distorts the size of the dialog on some
+ displays.
+
2005-11-10 Srinivasa Ragavan <sragavan@novell.com>
* e-shell-settings-dialog.c (set_dialog_size)
diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c
index e9ab725338..0b96b2cf63 100644
--- a/shell/e-shell-settings-dialog.c
+++ b/shell/e-shell-settings-dialog.c
@@ -63,9 +63,9 @@ set_dialog_size (EShellSettingsDialog *dialog)
pango_layout_get_pixel_size (layout, &width, NULL);
- width *= 80;
+ width *= 60;
height = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics)
- + pango_font_metrics_get_descent (metrics)) * 40;
+ + pango_font_metrics_get_descent (metrics)) * 30;
gtk_window_set_default_size((GtkWindow *)dialog, width, height);
g_object_unref (layout);
@@ -311,7 +311,7 @@ e_shell_settings_dialog_init (EShellSettingsDialog *dialog)
priv->types = g_hash_table_new (g_str_hash, g_str_equal);
dialog->priv = priv;
- gtk_widget_hide (dialog);
+
load_pages (dialog);
set_dialog_size (dialog);