3 files changed, 75 insertions, 0 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index d1f12be115..273b26445e 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,14 @@
 2003-12-16  Hans Petter Jansson  <hpj@ximian.com>
 
+	* gui/contact-editor/e-contact-editor.c
+	(e_contact_editor_create_source_option_menu): Implement. Creates
+	source selection option menu.
+
+	* gui/contact-editor/contact-editor.glade: Add source selection custom
+	widget.
+
+2003-12-16  Hans Petter Jansson  <hpj@ximian.com>
+
 	* gui/widgets/e-addressbook-table-adapter.c
 	(addressbook_is_cell_editable): Disable cell editing.
 
diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
index 10b05c27b4..3fd8cd922c 100644
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ b/addressbook/gui/contact-editor/contact-editor.glade
@@ -1521,6 +1521,48 @@
 		  <property name="y_options">fill</property>
 		</packing>
 	      </child>
+
+	      <child>
+		<widget class="Custom" id="source-option-menu-source">
+		  <property name="visible">True</property>
+		  <property name="creation_function">e_contact_editor_create_source_option_menu</property>
+		  <property name="int1">0</property>
+		  <property name="int2">0</property>
+		  <property name="last_modification_time">Tue, 16 Dec 2003 23:18:06 GMT</property>
+		</widget>
+		<packing>
+		  <property name="left_attach">7</property>
+		  <property name="right_attach">8</property>
+		  <property name="top_attach">12</property>
+		  <property name="bottom_attach">13</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options">fill</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="label-addressbook">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Addressbook:</property>
+		  <property name="use_underline">False</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">1</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		</widget>
+		<packing>
+		  <property name="left_attach">5</property>
+		  <property name="right_attach">7</property>
+		  <property name="top_attach">12</property>
+		  <property name="bottom_attach">13</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"></property>
+		</packing>
+	      </child>
 	    </widget>
 	    <packing>
 	      <property name="tab_expand">False</property>
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index c9f96c4ab0..d29f700d1b 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -2661,6 +2661,30 @@ e_contact_editor_create_web(gchar *name,
 	return widget;
 }
 
+GtkWidget *
+e_contact_editor_create_source_option_menu (gchar *name,
+					    gchar *string1, gchar *string2,
+					    gint int1, gint int2);
+
+GtkWidget *
+e_contact_editor_create_source_option_menu (gchar *name,
+					    gchar *string1, gchar *string2,
+					    gint int1, gint int2)
+{
+	GtkWidget   *menu;
+	GConfClient *gconf_client;
+	ESourceList *source_list;
+
+	gconf_client = gconf_client_get_default ();
+	source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources");
+
+	menu = e_source_option_menu_new (source_list);
+	g_object_unref (source_list);
+
+	gtk_widget_show (menu);
+	return menu;
+}
+
 static void
 enable_widget (GtkWidget *widget, gboolean enabled)
 {