[nautilus-actions] Refactoring: Rename src/api/na-gconf-monitor.c to src/core/na-gconf-monitor.c

[Pierre Wieser <pwieser src gnome org>]

commit 82d9ee01b5e611ae36584a2e792e5a2811455a33
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Feb 15 16:52:41 2010 +0100

    Refactoring: Rename src/api/na-gconf-monitor.c to src/core/na-gconf-monitor.c

 ChangeLog                            |    1 +
 src/api/Makefile.am                  |    2 +-
 src/api/na-gconf-monitor.h           |    8 ++++----
 src/core/Makefile.am                 |    1 +
 src/{api => core}/na-gconf-monitor.c |   24 +++++++++++++-----------
 5 files changed, 20 insertions(+), 16 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 72ec40c..16f2581 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2009-02-15 Pierre Wieser <pwieser trychlos org>
 
+	Rename src/api/na-gconf-monitor.c to src/core/na-gconf-monitor.c
 	Rename src/core/na-utils.h to src/api/na-core-utils.h
 	Rename src/core/na-utils.c to src/core/na-core-utils.c
 
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
index d359c30..04e266f 100644
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
@@ -33,9 +33,9 @@ api_include_HEADERS = \
 	\
 	\
 	na-core-utils.h										\
+	na-gconf-monitor.h									\
 	na-dbus.h											\
 	na-gconf-keys.h										\
-	na-gconf-monitor.h									\
 	na-iio-provider.h									\
 	na-object-api.h										\
 	$(NULL)
diff --git a/src/api/na-gconf-monitor.h b/src/api/na-gconf-monitor.h
index 6666a9a..0c7a63a 100644
--- a/src/api/na-gconf-monitor.h
+++ b/src/api/na-gconf-monitor.h
@@ -28,13 +28,13 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NAUTILUS_ACTIONS_NA_GCONF_MONITOR_H__
-#define __NAUTILUS_ACTIONS_NA_GCONF_MONITOR_H__
+#ifndef __NAUTILUS_ACTIONS_API_NA_GCONF_MONITOR_H__
+#define __NAUTILUS_ACTIONS_API_NA_GCONF_MONITOR_H__
 
 /**
  * SECTION: na_gconf_monitor
  * @short_description: #NAGConfMonitor class definition.
- * @include: nautilus-actions/api/na-gconf-monitor.h
+ * @include: nautilus-actions/na-gconf-monitor.h
  *
  * This class manages the GConf monitoring.
  * It is used to monitor both the GConf provider and the GConf runtime
@@ -76,4 +76,4 @@ void            na_gconf_monitor_release_monitors( GList *monitors );
 
 G_END_DECLS
 
-#endif /* __NAUTILUS_ACTIONS_NA_GCONF_MONITOR_H__ */
+#endif /* __NAUTILUS_ACTIONS_API_NA_GCONF_MONITOR_H__ */
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 4890519..7a40b64 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -38,6 +38,7 @@ AM_CPPFLAGS += \
 
 libna_core_la_SOURCES = \
 	na-core-utils.c										\
+	na-gconf-monitor.c									\
 	\
 	na-gconf-utils.c									\
 	na-gconf-utils.h									\
diff --git a/src/api/na-gconf-monitor.c b/src/core/na-gconf-monitor.c
similarity index 93%
rename from src/api/na-gconf-monitor.c
rename to src/core/na-gconf-monitor.c
index dda34c1..1de407b 100644
--- a/src/api/na-gconf-monitor.c
+++ b/src/core/na-gconf-monitor.c
@@ -32,7 +32,7 @@
 #include <config.h>
 #endif
 
-#include "na-gconf-monitor.h"
+#include <api/na-gconf-monitor.h>
 
 /* private class data
  */
@@ -266,18 +266,20 @@ release_monitor( NAGConfMonitor *monitor )
 
 	g_debug( "%s: monitor=%p", thisfn, ( void * ) monitor );
 	g_return_if_fail( NA_IS_GCONF_MONITOR( monitor ));
-	g_return_if_fail( !monitor->private->dispose_has_run );
 
-	if( monitor->private->monitor_id ){
-		gconf_client_notify_remove( monitor->private->gconf, monitor->private->monitor_id );
-	}
+	if( !monitor->private->dispose_has_run ){
 
-	gconf_client_remove_dir( monitor->private->gconf, monitor->private->path, &error );
+		if( monitor->private->monitor_id ){
+			gconf_client_notify_remove( monitor->private->gconf, monitor->private->monitor_id );
+		}
 
-	if( error ){
-		g_warning( "%s: path=%s, error=%s", thisfn, monitor->private->path, error->message );
-		g_error_free( error );
-	}
+		gconf_client_remove_dir( monitor->private->gconf, monitor->private->path, &error );
+
+		if( error ){
+			g_warning( "%s: path=%s, error=%s", thisfn, monitor->private->path, error->message );
+			g_error_free( error );
+		}
 
-	g_object_unref( monitor->private->gconf );
+		g_object_unref( monitor->private->gconf );
+	}
 }