diff options
| -rw-r--r-- | plugins/email-custom-header/ChangeLog | 9 | ||||
| -rw-r--r-- | plugins/email-custom-header/email-custom-header.c | 6 | ||||
| -rw-r--r-- | plugins/email-custom-header/org-gnome-email-custom-header.glade | 59 |
3 files changed, 20 insertions, 54 deletions
diff --git a/plugins/email-custom-header/ChangeLog b/plugins/email-custom-header/ChangeLog index 22da48eb0c..12aed1ca8d 100644 --- a/plugins/email-custom-header/ChangeLog +++ b/plugins/email-custom-header/ChangeLog @@ -1,3 +1,12 @@ +2008-06-02 Ashish Shrivastava <shashish@novell.com> + + ** Fixes bug #536183 + + * email-custom-header.c: + * org-gnome-email-custom-header.glade: + Change email custom header's dialog to non-modal. + Remove un-used tab from dialog + 2008-05-22 Matthew Barnes <mbarnes@redhat.com> * email-custom-header.c (action_email_custom_header_cb): diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index 3d7fab9763..cdd4a14a69 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -48,7 +48,6 @@ struct _EmailCustomHeaderOptionsDialogPrivate { /*Widgets*/ GtkWidget *main; GtkWidget *page; - GtkNotebook *notebook; GtkWidget *header_table; GtkWidget *header_type_name_label; GArray *combo_box_header_value; @@ -104,12 +103,10 @@ epech_get_widgets (CustomHeaderOptionsDialog *mch) return FALSE; priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox"); - priv->notebook = (GtkNotebook *) EMAIL_CUSTOM_HEADER ("email-custom-header-notebook"); priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options"); #undef EMAIL_CUSTOM_HEADER return (priv->page - &&priv->notebook &&priv->header_table); } @@ -237,7 +234,6 @@ epech_dialog_run (CustomHeaderOptionsDialog *mch, GtkWidget *parent) epech_fill_widgets_with_data (mch); g_signal_connect (GTK_DIALOG (priv->main), "response", G_CALLBACK(epech_header_options_cb), mch); - gtk_window_set_modal ((GtkWindow *) priv->main, TRUE); gtk_widget_show (priv->main); return TRUE; @@ -387,7 +383,7 @@ epech_dialog_init (GObject *object) mch->priv = priv; priv->xml = NULL; priv->main = NULL; - priv->notebook = NULL; + priv->page = NULL; priv->header_table = NULL; } diff --git a/plugins/email-custom-header/org-gnome-email-custom-header.glade b/plugins/email-custom-header/org-gnome-email-custom-header.glade index bd4910a480..142f0b7408 100644 --- a/plugins/email-custom-header/org-gnome-email-custom-header.glade +++ b/plugins/email-custom-header/org-gnome-email-custom-header.glade @@ -10,7 +10,7 @@ <property name="title" translatable="yes">Email Custom Header</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_MOUSE</property> - <property name="modal">True</property> + <property name="modal">False</property> <property name="resizable">False</property> <property name="destroy_with_parent">False</property> <property name="decorated">True</property> @@ -82,58 +82,19 @@ </child> <child> - <widget class="GtkNotebook" id="email-custom-header-notebook"> + <widget class="GtkTable" id="email-custom-header-options"> + <property name="border_width">12</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_tabs">True</property> - <property name="show_border">True</property> - <property name="tab_pos">GTK_POS_TOP</property> - <property name="scrollable">False</property> - <property name="enable_popup">False</property> - - <child> - <widget class="GtkTable" id="email-custom-header-options"> - <property name="border_width">12</property> - <property name="visible">True</property> - <property name="n_rows">4</property> - <property name="n_columns">4</property> - <property name="homogeneous">False</property> - <property name="row_spacing">12</property> - <property name="column_spacing">12</property> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="gopts-label"> - <property name="visible">True</property> - <property name="label" translatable="yes">Custom Header Options</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> + <property name="n_rows">4</property> + <property name="n_columns">4</property> + <property name="homogeneous">False</property> + <property name="row_spacing">12</property> + <property name="column_spacing">12</property> </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </widget> |