Use bonobo_object_client_(un)?ref instead of gtk_object_(un)?ref.

2002-05-03  Christopher James Lahey  <clahey@ximian.com>

	* e-folder-list.c: Use bonobo_object_client_(un)?ref instead of
	gtk_object_(un)?ref.
	(add_clicked): Don't pass NULL to
	evolution_shell_client_user_select_folder.

	* glade/Makefile.am: Added e-folder-list.glade

	* glade/e-folder-list.glade: The glade file for e-folder-list.

svn path=/trunk/; revision=16678

4 files changed, 148 insertions, 2 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index c47a18101d..32f49c3c42 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,16 @@
 2002-05-03  Christopher James Lahey  <clahey@ximian.com>
 
+	* e-folder-list.c: Use bonobo_object_client_(un)?ref instead of
+	gtk_object_(un)?ref.
+	(add_clicked): Don't pass NULL to
+	evolution_shell_client_user_select_folder.
+
+	* glade/Makefile.am: Added e-folder-list.glade
+
+	* glade/e-folder-list.glade: The glade file for e-folder-list.
+
+2002-05-03  Christopher James Lahey  <clahey@ximian.com>
+
 	* Makefile.am (eshellinclude_HEADERS): Added e-folder-list.h.
 	(libeshell_la_SOURCES): Added e-folder-list.c.
 
diff --git a/shell/e-folder-list.c b/shell/e-folder-list.c
index 582a513ca7..501523a49c 100644
--- a/shell/e-folder-list.c
+++ b/shell/e-folder-list.c
@@ -77,6 +77,10 @@ e_folder_list_destroy (GtkObject *object)
 
 	if (efl->priv->gui)
 		gtk_object_unref(GTK_OBJECT(efl->priv->gui));
+	if (efl->priv->client)
+		bonobo_object_client_unref(BONOBO_OBJECT_CLIENT(efl->priv->client), NULL);
+	g_free (efl->priv);
+	efl->priv = NULL;
 
 	if (GTK_OBJECT_CLASS (parent_class)->destroy)
 		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
@@ -239,7 +243,7 @@ add_clicked (GtkButton *button, EFolderList *efl)
 	evolution_shell_client_user_select_folder (efl->priv->client,
 						   GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (efl))),
 						   _("Add a Folder"),
-						   NULL,
+						   "",
 						   (const gchar **) efl->priv->possible_types,
 						   &folder);
 
@@ -509,6 +513,7 @@ GtkWidget*
 e_folder_list_construct (EFolderList *efl, EvolutionShellClient *client, char *xml)
 {
 	efl->priv->client = client;
+	bonobo_object_client_ref (BONOBO_OBJECT_CLIENT (efl->priv->client), NULL);
 	e_folder_list_set_xml (efl, xml);
 	return GTK_WIDGET (efl);
 }
diff --git a/shell/glade/Makefile.am b/shell/glade/Makefile.am
index a53765cda5..ada34672bd 100644
--- a/shell/glade/Makefile.am
+++ b/shell/glade/Makefile.am
@@ -4,6 +4,7 @@ glade_DATA =					\
 	e-active-connection-dialog.glade	\
 	e-shell-config-default-folders.glade	\
 	e-shell-folder-creation-dialog.glade	\
-	evolution-startup-wizard.glade
+	evolution-startup-wizard.glade		\
+	e-folder-list.glade
 
 EXTRA_DIST = $(glade_DATA)
diff --git a/shell/glade/e-folder-list.glade b/shell/glade/e-folder-list.glade
new file mode 100644
index 0000000000..411a6da0ec
--- /dev/null
+++ b/shell/glade/e-folder-list.glade
@@ -0,0 +1,129 @@
+<?xml version="1.0"?>
+<GTK-Interface>
+
+<project>
+  <name>e-addressbook-folder-list</name>
+  <program_name>e-addressbook-folder-list</program_name>
+  <directory></directory>
+  <source_directory>src</source_directory>
+  <pixmaps_directory>pixmaps</pixmaps_directory>
+  <language>C</language>
+  <gnome_support>True</gnome_support>
+  <gettext_support>True</gettext_support>
+  <output_main_file>False</output_main_file>
+  <output_support_files>False</output_support_files>
+  <output_build_files>False</output_build_files>
+</project>
+
+<widget>
+  <class>GtkWindow</class>
+  <name>window-contents-reparented</name>
+  <visible>False</visible>
+  <title>window1</title>
+  <type>GTK_WINDOW_TOPLEVEL</type>
+  <position>GTK_WIN_POS_NONE</position>
+  <modal>False</modal>
+  <allow_shrink>False</allow_shrink>
+  <allow_grow>True</allow_grow>
+  <auto_shrink>False</auto_shrink>
+
+  <widget>
+    <class>GtkFrame</class>
+    <name>frame-toplevel</name>
+    <label></label>
+    <label_xalign>0</label_xalign>
+    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+
+    <widget>
+      <class>GtkVBox</class>
+      <name>vbox1</name>
+      <homogeneous>False</homogeneous>
+      <spacing>0</spacing>
+
+      <widget>
+	<class>Custom</class>
+	<name>custom-optionmenu</name>
+	<creation_function>create_custom_optionmenu</creation_function>
+	<int1>0</int1>
+	<int2>0</int2>
+	<last_modification_time>Fri, 22 Mar 2002 15:09:48 GMT</last_modification_time>
+	<child>
+	  <padding>0</padding>
+	  <expand>False</expand>
+	  <fill>True</fill>
+	</child>
+      </widget>
+
+      <widget>
+	<class>GtkHBox</class>
+	<name>hbox1</name>
+	<homogeneous>False</homogeneous>
+	<spacing>0</spacing>
+	<child>
+	  <padding>0</padding>
+	  <expand>True</expand>
+	  <fill>True</fill>
+	</child>
+
+	<widget>
+	  <class>Custom</class>
+	  <name>custom-folder-list</name>
+	  <creation_function>create_custom_folder_list</creation_function>
+	  <int1>0</int1>
+	  <int2>0</int2>
+	  <last_modification_time>Tue, 19 Mar 2002 18:07:28 GMT</last_modification_time>
+	  <child>
+	    <padding>0</padding>
+	    <expand>True</expand>
+	    <fill>True</fill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkVButtonBox</class>
+	  <name>vbuttonbox1</name>
+	  <layout_style>GTK_BUTTONBOX_START</layout_style>
+	  <spacing>0</spacing>
+	  <child_min_width>85</child_min_width>
+	  <child_min_height>27</child_min_height>
+	  <child_ipad_x>7</child_ipad_x>
+	  <child_ipad_y>0</child_ipad_y>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
+
+	  <widget>
+	    <class>GtkButton</class>
+	    <name>button-add</name>
+	    <can_default>True</can_default>
+	    <can_focus>True</can_focus>
+	    <label>_Add</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
+	  </widget>
+
+	  <widget>
+	    <class>GtkButton</class>
+	    <name>button-edit</name>
+	    <can_default>True</can_default>
+	    <can_focus>True</can_focus>
+	    <label>_Edit</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
+	  </widget>
+
+	  <widget>
+	    <class>GtkButton</class>
+	    <name>button-remove</name>
+	    <can_default>True</can_default>
+	    <can_focus>True</can_focus>
+	    <label>_Remove</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
+	  </widget>
+	</widget>
+      </widget>
+    </widget>
+  </widget>
+</widget>
+
+</GTK-Interface>