** Fixes part of bug #417999

2007-10-22  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes part of bug #417999

	* addressbook/gui/contact-editor/contact-editor.glade:
	* addressbook/gui/contact-editor/e-contact-editor.c:
	* addressbook/gui/contact-editor/e-contact-quick-add.c:
	* addressbook/gui/contact-list-editor/contact-list-editor.c:
	* addressbook/gui/contact-list-editor/contact-list-editor.glade:
	* calendar/gui/dialogs/event-page.c:
	* calendar/gui/dialogs/event-page.glade:
	* calendar/gui/dialogs/memo-page.c:
	* calendar/gui/dialogs/memo-page.glade:
	* calendar/gui/dialogs/task-page.c:
	* calendar/gui/dialogs/task-page.glade:
	* calendar/gui/e-itip-control.c:
	* plugins/bbdb/bbdb.c:
	* plugins/bbdb/gaimbuddies.c:
	* plugins/itip-formatter/itip-view.c:
	* widgets/misc/e-pilot-settings.c:
	Use ESourceComboBox instead of ESourceOptionMenu (deprecated).


svn path=/trunk/; revision=34408

1 files changed, 14 insertions, 14 deletions

diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 8e408604fb..2a082c7ba3 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -44,7 +44,7 @@
 #include <gtkhtml/gtkhtml-embedded.h>
 #include <gtkhtml/gtkhtml-stream.h>
 #include <libedataserver/e-source-list.h>
-#include <libedataserverui/e-source-option-menu.h>
+#include <libedataserverui/e-source-combo-box.h>
 #include <libical/ical.h>
 #include <libecal/e-cal-component.h>
 #include <libecal/e-cal-time-util.h>
@@ -226,13 +226,13 @@ typedef struct {
 } EItipControlFindData;
 
 static void
-source_selected_cb (ESourceOptionMenu *esom, ESource *source, gpointer data)
+source_changed_cb (ESourceComboBox *escb, EItipControl *itip)
 {
-	EItipControl *itip = data;
-	EItipControlPrivate *priv;
-	
-	priv = itip->priv;
+	EItipControlPrivate *priv = itip->priv;
+	ESource *source;
 
+	source = e_source_combo_box_get_active (escb);
+	
 	if (priv->ok)
 		gtk_widget_set_sensitive (priv->ok, FALSE);
 
@@ -273,7 +273,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
  cleanup:
 	if (fd->count == 0) {
 		if (fd->show_selector && !priv->current_ecal && priv->vbox) {
-			GtkWidget *esom;
+			GtkWidget *escb;
 			char *uid;
 
 			switch (priv->type) {
@@ -297,17 +297,17 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 			if (!source)
 				source = e_source_list_peek_source_any (priv->source_lists[priv->type]);
 
-			esom = e_source_option_menu_new (priv->source_lists[priv->type]);
-			g_signal_connect_object (esom, "source_selected",
-						 G_CALLBACK (source_selected_cb), 
-						 fd->itip, 0);
+			escb = e_source_combo_box_new (priv->source_lists[priv->type]);
+			g_signal_connect_object (
+				escb, "changed",
+				G_CALLBACK (source_changed_cb), fd->itip, 0);
 
-			gtk_box_pack_start (GTK_BOX (priv->vbox), esom, FALSE, TRUE, 0);
-			gtk_widget_show (esom);
+			gtk_box_pack_start (GTK_BOX (priv->vbox), escb, FALSE, TRUE, 0);
+			gtk_widget_show (escb);
 
 			/* FIXME What if there is no source? */
 			if (source)
-				e_source_option_menu_select (E_SOURCE_OPTION_MENU (esom), source);
+				e_source_combo_box_set_active (E_SOURCE_COMBO_BOX (escb), source);
 		} else {
 			/* FIXME Display error message to user */
 		}