gnome-utils r8249 - trunk/logview

[cosimoc svn gnome org]

Author: cosimoc
Date: Tue Dec 23 13:26:07 2008
New Revision: 8249
URL: http://svn.gnome.org/viewvc/gnome-utils?rev=8249&view=rev

Log:
Add marshal generator for "active-log-changed" and remove unused files
(for now) from Makefile.am

Added:
   trunk/logview/logview-marshal.list
Modified:
   trunk/logview/Makefile.am
   trunk/logview/logview-manager.c

Modified: trunk/logview/Makefile.am
==============================================================================
--- trunk/logview/Makefile.am	(original)
+++ trunk/logview/Makefile.am	Tue Dec 23 13:26:07 2008
@@ -17,6 +17,10 @@
 
 bin_PROGRAMS = gnome-system-log
 
+BUILT_SOURCES = 		\
+	logview-marshal.c	\
+	logview-marshal.h
+
 gnome_system_log_SOURCES = 	\
 	logview-main.c		\
 	logview-about.h		\
@@ -34,13 +38,19 @@
 	misc.h			\
 	logview-prefs.c		\
 	logview-prefs.h		\
-	logview-findbar.c	\
-	logview-findbar.h
+	$(BUILT_SOURCES)
 
 gnome_system_log_LDADD = \
 	$(GNOME_UTILS_LIBS)	\
 	$(LIBGNOME_LIBS)
 
+logview-marshal.h: logview-marshal.list $(GLIB_GENMARSHAL)
+	$(GLIB_GENMARSHAL) $< --header --prefix=logview_marshal >> $@
+
+logview-marshal.c: logview-marshal.list $(GLIB_GENMARSHAL)
+	echo "#include \"logview-marshal.h\"" > $@ && \
+	$(GLIB_GENMARSHAL) $< --body --prefix=logview_marshal >> $@
+
 man_MANS = gnome-system-log.1
 
 Utilities_in_files = gnome-system-log.desktop.in
@@ -92,7 +102,8 @@
 CLEANFILES = 				\
 	gnome-system-log.desktop	\
 	gnome-system-log.desktop.in	\
-	logview.schemas
+	logview.schemas			\
+	$(BUILT_SOURCES)
 
 dist-hook:
 	cd $(distdir) ; rm -f $(CLEANFILES)

Modified: trunk/logview/logview-manager.c
==============================================================================
--- trunk/logview/logview-manager.c	(original)
+++ trunk/logview/logview-manager.c	Tue Dec 23 13:26:07 2008
@@ -22,6 +22,8 @@
 
 #include "logview-manager.h"
 
+#include "logview-marshal.h"
+
 enum {
   LOG_ADDED,
   LOG_CLOSED,
@@ -104,7 +106,7 @@
                                           G_SIGNAL_RUN_LAST,
                                           G_STRUCT_OFFSET (LogviewManagerClass, active_changed),
                                           NULL, NULL,
-                                          g_cclosure_marshal_VOID__OBJECT,
+                                          logview_marshal_VOID__OBJECT_OBJECT,
                                           G_TYPE_NONE, 2,
                                           LOGVIEW_TYPE_LOG,
                                           LOGVIEW_TYPE_LOG);
@@ -127,7 +129,7 @@
                GError *error,
                gpointer user_data)
 {
-  CreateCBData *data;
+  CreateCBData *data = user_data;
 
   if (log) {
     /* creation went well, store the log and notify */
@@ -136,7 +138,7 @@
     g_signal_emit (data->manager, signals[LOG_ADDED], 0, log, NULL);
 
     if (data->set_active) {
-      logview_manager_set_active (data->manager, log);
+      logview_manager_set_active_log (data->manager, log);
     }
   } else {
     /* notify the error */

Added: trunk/logview/logview-marshal.list
==============================================================================
--- (empty file)
+++ trunk/logview/logview-marshal.list	Tue Dec 23 13:26:07 2008
@@ -0,0 +1 @@
+VOID:OBJECT,OBJECT