brasero r640 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Sun Feb 17 12:26:21 2008
New Revision: 640
URL: http://svn.gnome.org/viewvc/brasero?rev=640&view=rev

Log:
Fix for compilation without inotify

* src/Makefile.am:
* src/brasero-data-project.c: (brasero_data_project_node_removed),
(brasero_data_project_node_loaded),
(brasero_data_project_add_node_from_info),
(brasero_data_project_clear), (brasero_data_project_class_init):
* src/brasero-data-project.h:
* src/brasero-file-monitor.c:

Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/brasero-data-project.c
   trunk/src/brasero-data-project.h
   trunk/src/brasero-file-monitor.c

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Feb 17 12:26:21 2008
@@ -222,8 +222,6 @@
 	brasero-data-tree-model.h         \
 	brasero-data-vfs.c         \
 	brasero-data-vfs.h         \
-	brasero-file-monitor.c         \
-	brasero-file-monitor.h         \
 	brasero-file-node.c         \
 	brasero-file-node.h         \
 	brasero-data-disc.h         \
@@ -238,6 +236,10 @@
 	baobab-cell-renderer-progress.h         \
 	scsi-device.h 
 
+if BUILD_INOTIFY
+brasero_SOURCES += brasero-file-monitor.c brasero-file-monitor.h
+endif
+
 brasero_LDADD =	\
 	$(BRASERO_LIBS)
 

Modified: trunk/src/brasero-data-project.c
==============================================================================
--- trunk/src/brasero-data-project.c	(original)
+++ trunk/src/brasero-data-project.c	Sun Feb 17 12:26:21 2008
@@ -36,7 +36,6 @@
 
 #include <libgnomevfs/gnome-vfs.h>
 
-#include "brasero-file-monitor.h"
 #include "brasero-data-project.h"
 #include "brasero-marshal.h"
 
@@ -74,8 +73,18 @@
 
 #define BRASERO_DATA_PROJECT_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE ((o), BRASERO_TYPE_DATA_PROJECT, BraseroDataProjectPrivate))
 
+#ifdef BUILD_INOTIFY
+
+#include "brasero-file-monitor.h"
 G_DEFINE_TYPE (BraseroDataProject, brasero_data_project, BRASERO_TYPE_FILE_MONITOR);
 
+#else
+
+G_DEFINE_TYPE (BraseroDataProject, brasero_data_project, G_TYPE_OBJECT);
+
+#endif
+
+
 enum {
 	NAME_COLLISION_SIGNAL,
 	SIZE_CHANGED_SIGNAL,
@@ -947,6 +956,8 @@
 				     &callback_data);
 }
 
+#ifdef BUILD_INOTIFY
+
 static gboolean
 brasero_data_project_monitor_cancel_foreach_cb (gpointer data,
 						gpointer callback_data)
@@ -960,6 +971,8 @@
 	return brasero_file_node_is_ancestor (parent, node);
 }
 
+#endif
+
 static void
 brasero_data_project_node_removed (BraseroDataProject *self,
 				   BraseroFileNode *node)
@@ -968,11 +981,13 @@
 
 	priv = BRASERO_DATA_PROJECT_PRIVATE (self);
 
+#ifdef BUILD_INOTIFY
 	/* remove all monitoring */
 	if (node->is_monitored)
 		brasero_file_monitor_foreach_cancel (BRASERO_FILE_MONITOR (self),
 						     brasero_data_project_monitor_cancel_foreach_cb,
 						     node);
+#endif
 
 	/* invalidate possible references (including for children)*/
 	brasero_data_project_reference_invalidate (self, node);
@@ -1671,6 +1686,7 @@
 	 * particular if it's a file or a directory, if it's grafted or not
 	 * That's why we can start monitoring it. */
 	if (!node->is_monitored) {
+#ifdef BUILD_INOTIFY
 		if (node->is_grafted)
 			brasero_file_monitor_single_file (BRASERO_FILE_MONITOR (self),
 							  uri,
@@ -1681,6 +1697,7 @@
 								 uri,
 								 node);
 		node->is_monitored = TRUE;
+#endif
 	}
 
 	/* signal the changes */
@@ -1904,6 +1921,9 @@
 	 * particular if it's a file or a directory, if it's grafted or not
 	 * That's why we can start monitoring it. */
 	if (!node->is_monitored) {
+
+#ifdef BUILD_INOTIFY
+
 		if (node->is_grafted)
 			brasero_file_monitor_single_file (BRASERO_FILE_MONITOR (self),
 							  uri,
@@ -1914,6 +1934,9 @@
 								 uri,
 								 node);
 		node->is_monitored = TRUE;
+
+#endif
+
 	}
 
 	return node;
@@ -2779,7 +2802,11 @@
 	brasero_file_node_destroy (priv->root);
 	priv->root = NULL;
 
+#ifdef BUILD_INOTIFY
+
 	brasero_file_monitor_reset (BRASERO_FILE_MONITOR (self));
+
+#endif
 }
 
 void
@@ -2831,6 +2858,8 @@
  * Callbacks for inotify backend
  */
 
+#ifdef BUILD_INOTIFY
+
 static void
 brasero_data_project_file_added (BraseroFileMonitor *monitor,
 				 gpointer callback_data,
@@ -3229,11 +3258,12 @@
 	g_free (uri);
 }
 
+#endif
+
 static void
 brasero_data_project_class_init (BraseroDataProjectClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	BraseroFileMonitorClass *monitor_class = BRASERO_FILE_MONITOR_CLASS (klass);
 
 	g_type_class_add_private (klass, sizeof (BraseroDataProjectPrivate));
 
@@ -3290,9 +3320,15 @@
 			  1,
 			  G_TYPE_INT);
 
+#ifdef BUILD_INOTIFY
+
+	BraseroFileMonitorClass *monitor_class = BRASERO_FILE_MONITOR_CLASS (klass);
+
 	monitor_class->file_added = brasero_data_project_file_added;
 	monitor_class->file_moved = brasero_data_project_file_moved;
 	monitor_class->file_removed = brasero_data_project_file_removed;
 	monitor_class->file_renamed = brasero_data_project_file_renamed;
 	monitor_class->file_modified = brasero_data_project_file_modified;
+
+#endif
 }

Modified: trunk/src/brasero-data-project.h
==============================================================================
--- trunk/src/brasero-data-project.h	(original)
+++ trunk/src/brasero-data-project.h	Sun Feb 17 12:26:21 2008
@@ -22,6 +22,10 @@
  * 	Boston, MA  02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef _BRASERO_DATA_PROJECT_H_
 #define _BRASERO_DATA_PROJECT_H_
 
@@ -29,9 +33,12 @@
 #include <gtk/gtk.h>
 
 #include "brasero-file-node.h"
-#include "brasero-file-monitor.h"
 #include "burn-session.h"
 
+#ifdef BUILD_INOTIFY
+#include "brasero-file-monitor.h"
+#endif
+
 G_BEGIN_DECLS
 
 #define BRASERO_TYPE_DATA_PROJECT             (brasero_data_project_get_type ())
@@ -46,7 +53,11 @@
 
 struct _BraseroDataProjectClass
 {
+#ifdef BUILD_INOTIFY
 	BraseroFileMonitorClass parent_class;
+#else
+	GObjectClass parent_class;
+#endif
 
 	/* virtual functions */
 
@@ -73,7 +84,11 @@
 
 struct _BraseroDataProject
 {
+#ifdef BUILD_INOTIFY
 	BraseroFileMonitor parent_instance;
+#else
+	GObject parent_instance;
+#endif
 };
 
 GType brasero_data_project_get_type (void) G_GNUC_CONST;

Modified: trunk/src/brasero-file-monitor.c
==============================================================================
--- trunk/src/brasero-file-monitor.c	(original)
+++ trunk/src/brasero-file-monitor.c	Sun Feb 17 12:26:21 2008
@@ -34,12 +34,8 @@
 
 #include <libgnomevfs/gnome-vfs.h>
 
-#ifdef BUILD_INOTIFY
-
 #include <sys/inotify.h>
 
-#endif
-
 #include "brasero-file-monitor.h"
 #include "burn-debug.h"
 
@@ -101,8 +97,6 @@
 	g_free (data);
 }
 
-#ifdef BUILD_INOTIFY
-
 static void
 brasero_file_monitor_moved_to_event (BraseroFileMonitor *self,
 				     gpointer callback_data,
@@ -602,8 +596,6 @@
 	return wd;
 }
 
-#endif
-
 /**
  * This is used for top grafted directories in the hierarchies or for
  * single grafted files whose parents are not watched and for which we