check for empty trailing sections/pages after we exit the main loop.

2004-10-20  Not Zed  <NotZed@Ximian.com>

        * e-config.c (ec_rebuild): check for empty trailing sections/pages
        after we exit the main loop.

        * e-plugin.c (e_plugin_get_type): make ~/.eplugins the default
        eplugin location, not ~/.eplug.

2004-10-18  Not Zed  <NotZed@Ximian.com>

        * e-config.h: fix some forward decls.

svn path=/trunk/; revision=27644

4 files changed, 38 insertions, 5 deletions

diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 2d67c0f9c5..a881ab9163 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,15 @@
+2004-10-20  Not Zed  <NotZed@Ximian.com>
+
+	* e-config.c (ec_rebuild): check for empty trailing sections/pages
+	after we exit the main loop.
+
+	* e-plugin.c (e_plugin_get_type): make ~/.eplugins the default
+	eplugin location, not ~/.eplug.
+
+2004-10-18  Not Zed  <NotZed@Ximian.com>
+
+	* e-config.h: fix some forward decls.
+
 2004-10-19  JP Rosevear  <jpr@novell.com>
 
 	* e-config.c, e-event.c, e-menu.c, e-plugin.c, e-plugin.h,
diff --git a/e-util/e-config.c b/e-util/e-config.c
index 2e0f47ddeb..d1c5611a40 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -707,6 +707,26 @@ ec_rebuild(EConfig *emp)
 		}
 	}
 
+	/* If the last section doesn't contain anything, hide it */
+	if (sectionnode != NULL) {
+		if ( (sectionnode->empty = itemno == 0) ) {
+			gtk_widget_hide(sectionnode->frame);
+			sectionno--;
+		} else
+			gtk_widget_show(sectionnode->frame);
+		printf("%s section '%s' [sections=%d]\n", sectionnode->empty?"hiding":"showing", sectionnode->item->path, sectionno);
+	}
+
+	/* If the last page doesn't contain anything, hide it */
+	if (pagenode != NULL) {
+		if ( (pagenode->empty = sectionno == 0) ) {
+			gtk_widget_hide(pagenode->frame);
+			pageno--;
+		} else
+			gtk_widget_show(pagenode->frame);
+		printf("%s page '%s' [section=%d]\n", pagenode->empty?"hiding":"showing", pagenode->item->path, pageno);
+	}
+
 	if (book) {
 		/* make this depend on flags?? */
 		if (gtk_notebook_get_n_pages((GtkNotebook *)book) == 1) {
diff --git a/e-util/e-config.h b/e-util/e-config.h
index 96a6a7025a..b05990f625 100644
--- a/e-util/e-config.h
+++ b/e-util/e-config.h
@@ -239,13 +239,13 @@ void e_config_add_page_check(EConfig *, const char *pageid, EConfigCheckFunc, vo
 
 void e_config_set_target(EConfig *emp, EConfigTarget *target);
 struct _GtkWidget *e_config_create_widget(EConfig *);
-GtkWidget *e_config_create_window(EConfig *emp, struct _GtkWindow *parent, const char *title);
+struct _GtkWidget *e_config_create_window(EConfig *emp, struct _GtkWindow *parent, const char *title);
 
 void e_config_target_changed(EConfig *emp, e_config_target_change_t how);
 
 gboolean e_config_page_check(EConfig *, const char *);
 
-GtkWidget *e_config_page_get(EConfig *ec, const char *pageid);
+struct _GtkWidget *e_config_page_get(EConfig *ec, const char *pageid);
 const char *e_config_page_next(EConfig *ec, const char *pageid);
 const char *e_config_page_prev(EConfig *ec, const char *pageid);
 
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index 0dd8fb4e17..959d1391a6 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -187,7 +187,7 @@ e_plugin_get_type(void)
 			/* Add the global path */
 			e_plugin_add_load_path(EVOLUTION_PLUGINDIR);
 
-			path = g_build_filename(g_get_home_dir(), ".eplug", NULL);
+			path = g_build_filename(g_get_home_dir(), ".eplugins", NULL);
 		}
 		
 		p = path;
@@ -343,8 +343,9 @@ ep_load_pending(EPlugin *ep, EPluginHookClass *type)
  * @path: The path to add to search for plugins.
  * 
  * Add a path to be searched when e_plugin_load_plugins() is called.
- * By default ~/.eplug is used as the search path unless overriden by
- * the environmental variable %EVOLUTION_PLUGIN_PATH.
+ * By default the system plugin directory and ~/.eplugins is used as
+ * the search path unless overriden by the environmental variable
+ * %EVOLUTION_PLUGIN_PATH.
  *
  * %EVOLUTION_PLUGIN_PATH is a : separated list of paths to search for
  * plugin definitions in order.