[Xfce4-commits] r26155 - xfdesktop/trunk/src

[Brian Tarricone]

Author: kelnos
Date: 2007-10-20 16:47:57 +0000 (Sat, 20 Oct 2007)
New Revision: 26155

Added:
   xfdesktop/trunk/src/xfdesktop-marshal.list
Modified:
   xfdesktop/trunk/src/Makefile.am
   xfdesktop/trunk/src/xfdesktop-icon-view.c
   xfdesktop/trunk/src/xfdesktop-icon.c
Log:
auto-generate marshalling functions


Modified: xfdesktop/trunk/src/Makefile.am
===================================================================
--- xfdesktop/trunk/src/Makefile.am	2007-10-20 16:46:39 UTC (rev 26154)
+++ xfdesktop/trunk/src/Makefile.am	2007-10-20 16:47:57 UTC (rev 26155)
@@ -14,7 +14,9 @@
 	xfce-desktop.c \
 	xfce-desktop.h \
 	xfce-desktop-settings.c \
-	xfce-desktop-settings.h
+	xfce-desktop-settings.h \
+	xfdesktop-marshal.c \
+	xfdesktop-marshal.h
 
 desktop_icon_sources = \
 	xfdesktop-icon.c \
@@ -107,9 +109,28 @@
 	$(THUNARX_LIBS) \
 	$(DBUS_LIBS)
 
+endif
+endif
+
 if MAINTAINER_MODE
 
 BUILT_SOURCES = \
+	xfdesktop-marshal.c \
+	xfdesktop-marshal.h
+
+xfdesktop-marshal.h: stamp-xfdesktop-marshal.h
+	@true
+stamp-xfdesktop-marshal.h: xfdesktop-marshal.list Makefile
+	glib-genmarshal --prefix=xfdesktop_marshal xfdesktop-marshal.list --header > xfdesktop-marshal.h
+	echo timestamp > $(@F)
+xfdesktop-marshal.c: xfdesktop-marshal.list Makefile
+	echo '#include "xfdesktop-marshal.h"' > xfdesktop-marshal.c
+	glib-genmarshal --prefix=xfdesktop_marshal xfdesktop-marshal.list --body >> xfdesktop-marshal.c
+
+
+if ENABLE_FILE_ICONS
+
+BUILT_SOURCES += \
 	xfdesktop-dbus-bindings-filemanager.h \
 	xfdesktop-dbus-bindings-trash.h
 DISTCLEANFILES = \
@@ -123,7 +144,10 @@
 	dbus-binding-tool --mode=glib-client --prefix=org_xfce_Trash $(srcdir)/xfdesktop-dbus-bindings-trash.xml > xfdesktop-dbus-bindings-trash.h
 
 endif
+
 endif
-endif
 
-EXTRA_DIST = $(desktop_icon_sources) $(desktop_file_icon_sources)
+EXTRA_DIST = \
+	$(desktop_icon_sources) \
+	$(desktop_file_icon_sources) \
+	xfdesktop-marshal.list

Modified: xfdesktop/trunk/src/xfdesktop-icon-view.c
===================================================================
--- xfdesktop/trunk/src/xfdesktop-icon-view.c	2007-10-20 16:46:39 UTC (rev 26154)
+++ xfdesktop/trunk/src/xfdesktop-icon-view.c	2007-10-20 16:47:57 UTC (rev 26155)
@@ -1,7 +1,7 @@
 /*
  *  xfdesktop - xfce4's desktop manager
  *
- *  Copyright (c) 2006 Brian Tarricone, <bjt23 at cornell.edu>
+ *  Copyright (c) 2006-2007 Brian Tarricone, <bjt23 at cornell.edu>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

Modified: xfdesktop/trunk/src/xfdesktop-icon.c
===================================================================
--- xfdesktop/trunk/src/xfdesktop-icon.c	2007-10-20 16:46:39 UTC (rev 26154)
+++ xfdesktop/trunk/src/xfdesktop-icon.c	2007-10-20 16:47:57 UTC (rev 26155)
@@ -1,7 +1,7 @@
 /*
  *  xfdesktop - xfce4's desktop manager
  *
- *  Copyright (c) 2006 Brian Tarricone, <bjt23 at cornell.edu>
+ *  Copyright (c) 2006-2007 Brian Tarricone, <bjt23 at cornell.edu>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@
 #include <gobject/gmarshal.h>
 
 #include "xfdesktop-icon.h"
+#include "xfdesktop-marshal.h"
 
 struct _XfdesktopIconPrivate
 {
@@ -58,38 +59,6 @@
 
 
 static void
-xfdesktop_icon_marshal_BOOLEAN__VOID(GClosure *closure,
-                                     GValue *return_value,
-                                     guint n_param_values,
-                                     const GValue *param_values,
-                                     gpointer invocation_hint,
-                                     gpointer marshal_data)
-{
-    typedef gboolean (*GMarshalFunc_BOOLEAN__VOID)(gpointer, gpointer);
-    register GMarshalFunc_BOOLEAN__VOID callback;
-    register GCClosure *cc = (GCClosure *)closure;
-    register gpointer data1, data2;
-    gboolean ret = FALSE;
-    
-    g_return_if_fail(return_value);
-    g_return_if_fail(n_param_values == 1);
-    
-    if(G_CCLOSURE_SWAP_DATA(closure)) {
-        data1 = closure->data;
-        data2 = g_value_peek_pointer(param_values + 0);
-    } else {
-        data1 = g_value_peek_pointer(param_values + 0);
-        data2 = closure->data;
-    }
-
-    callback = (GMarshalFunc_BOOLEAN__VOID)(marshal_data ? marshal_data : cc->callback);
-
-    ret = callback(data1, data2);
-    
-    g_value_set_boolean(return_value, ret);
-}
-
-static void
 xfdesktop_icon_class_init(XfdesktopIconClass *klass)
 {
     g_type_class_add_private(klass, sizeof(XfdesktopIconPrivate));
@@ -137,7 +106,7 @@
                                                             activated),
                                             g_signal_accumulator_true_handled,
                                             NULL,
-                                            xfdesktop_icon_marshal_BOOLEAN__VOID,
+                                            xfdesktop_marshal_BOOLEAN__VOID,
                                             G_TYPE_BOOLEAN, 0);
     
     __signals[SIG_MENU_POPUP] = g_signal_new("menu-popup",

Added: xfdesktop/trunk/src/xfdesktop-marshal.list
===================================================================
--- xfdesktop/trunk/src/xfdesktop-marshal.list	                        (rev 0)
+++ xfdesktop/trunk/src/xfdesktop-marshal.list	2007-10-20 16:47:57 UTC (rev 26155)
@@ -0,0 +1,2 @@
+BOOLEAN:VOID
+VOID:UINT,UINT,POINTER