[evolution/gtk-builder] GoTo dialog, signature combo and default junk combo fixes

[Milan Crha <mcrha src gnome org>]

commit a0c0bb068df49237101248b0f41951971b98776e
Author: Milan Crha <mcrha redhat com>
Date:   Mon Nov 9 16:27:44 2009 +0100

    GoTo dialog, signature combo and default junk combo fixes

 calendar/gui/goto.c                         |    5 ++---
 calendar/gui/goto.h                         |    2 +-
 mail/em-account-editor.c                    |    1 +
 modules/calendar/e-cal-shell-view-actions.c |    2 +-
 modules/mail/em-mailer-prefs.c              |    7 +++++++
 5 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c
index fdae6e1..86f06f3 100644
--- a/calendar/gui/goto.c
+++ b/calendar/gui/goto.c
@@ -203,7 +203,7 @@ goto_dialog_init_widgets (GoToDialog *dlg)
 
 /* Creates a "goto date" dialog and runs it */
 void
-goto_dialog (GnomeCalendar *gcal)
+goto_dialog (GtkWindow *parent, GnomeCalendar *gcal)
 {
 	ECalModel *model;
 	time_t start_time;
@@ -243,8 +243,7 @@ goto_dialog (GnomeCalendar *gcal)
 
 	goto_dialog_init_widgets (dlg);
 
-	gtk_window_set_transient_for (GTK_WINDOW (dlg->dialog),
-				      GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
+	gtk_window_set_transient_for (GTK_WINDOW (dlg->dialog), parent);
 
 	/* set initial selection to current day */
 
diff --git a/calendar/gui/goto.h b/calendar/gui/goto.h
index 3b774d2..2b81757 100644
--- a/calendar/gui/goto.h
+++ b/calendar/gui/goto.h
@@ -29,6 +29,6 @@
 
 #include "gnome-cal.h"
 
-void goto_dialog (GnomeCalendar *gcal);
+void goto_dialog (GtkWindow *parent, GnomeCalendar *gcal);
 
 #endif
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index f1ecff9..f4ba2f9 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -2147,6 +2147,7 @@ emae_identity_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
 #if 0
 		gtk_widget_hide (e_builder_get_widget (builder, "sigOption"));
 #endif
+		gtk_widget_hide (e_builder_get_widget (builder, "signature_dropdown"));
 		gtk_widget_hide (e_builder_get_widget (builder, "sigAddNew"));
 	}
 
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index 408d02f..320d3a7 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -174,7 +174,7 @@ action_calendar_jump_to_cb (GtkAction *action,
 	cal_shell_content = cal_shell_view->priv->cal_shell_content;
 	calendar = e_cal_shell_content_get_calendar (cal_shell_content);
 
-	goto_dialog (calendar);
+	goto_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (cal_shell_content))), calendar);
 }
 
 static void
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index a31525c..344f20e 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -744,6 +744,7 @@ static void
 junk_plugin_setup (GtkComboBox *combo_box, EMMailerPrefs *prefs)
 {
 	GtkListStore *store;
+	GtkCellRenderer *cell;
 	gint index = 0;
 	gboolean def_set = FALSE;
 	const GList *plugins = mail_session_get_junk_plugins();
@@ -752,6 +753,12 @@ junk_plugin_setup (GtkComboBox *combo_box, EMMailerPrefs *prefs)
 	store = gtk_list_store_new (1, G_TYPE_STRING);
 	gtk_combo_box_set_model (combo_box, GTK_TREE_MODEL (store));
 
+	cell = gtk_cell_renderer_text_new ();
+	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), cell, TRUE);
+	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), cell,
+					"text", 0,
+					NULL);
+
 	if (!plugins || !g_list_length ((GList *)plugins)) {
 		GtkTreeIter iter;