[Galago-commits] r2473 - in trunk/notification-daemon: . data po src
galago-commits at freedesktop.org
galago-commits at freedesktop.org
Mon Jan 23 00:28:27 PST 2006
Author: chipx86
Date: 2006-01-23 00:28:25 -0800 (Mon, 23 Jan 2006)
New Revision: 2473
Added:
trunk/notification-daemon/po/ChangeLog
Removed:
trunk/notification-daemon/src/notifydaemon-dbus-glue.h
Modified:
trunk/notification-daemon/ChangeLog
trunk/notification-daemon/Makefile.am
trunk/notification-daemon/configure.ac
trunk/notification-daemon/data/
trunk/notification-daemon/data/Makefile.am
trunk/notification-daemon/src/Makefile.am
Log:
make distcheck is now happy.
Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog 2006-01-23 07:55:30 UTC (rev 2472)
+++ trunk/notification-daemon/ChangeLog 2006-01-23 08:28:25 UTC (rev 2473)
@@ -1,3 +1,13 @@
+Mon Jan 23 00:27:53 PST 2006 Christian Hammond <chipx86 at chipx86.com>
+
+ * data/Makefile.am:
+ A po/ChangeLog:
+ * src/Makefile.am:
+ D src/notifydaemon-dbus-glue.h:
+ * Makefile.am:
+ * configure.ac:
+ - make distcheck is now happy.
+
Sun Jan 22 23:54:53 PST 2006 Christian Hammond <chipx86 at chipx86.com>
* src/daemon.c:
Modified: trunk/notification-daemon/Makefile.am
===================================================================
--- trunk/notification-daemon/Makefile.am 2006-01-23 07:55:30 UTC (rev 2472)
+++ trunk/notification-daemon/Makefile.am 2006-01-23 08:28:25 UTC (rev 2473)
@@ -4,9 +4,16 @@
AUTHORS NEWS INSTALL COPYING README \
ChangeLog \
autogen.sh \
- configure.ac
+ configure.ac \
+ intltool-extract.in \
+ intltool-merge.in \
+ intltool-update.in
$(OBJECTS): libtool
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
+DISTCLEANFILES = \
+ intltool-extract \
+ intltool-merge \
+ intltool-update
Modified: trunk/notification-daemon/configure.ac
===================================================================
--- trunk/notification-daemon/configure.ac 2006-01-23 07:55:30 UTC (rev 2472)
+++ trunk/notification-daemon/configure.ac 2006-01-23 08:28:25 UTC (rev 2473)
@@ -94,14 +94,13 @@
AC_SUBST(GDK_CFLAGS)
AC_SUBST(GDK_LIBS)
+AM_GCONF_SOURCE_2
AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
if test "x$GCONFTOOL" = "xno"; then
AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with Gconf])
fi
-AM_GCONF_SOURCE_2
-
dnl
dnl Check the D-BUS version.
dnl
Property changes on: trunk/notification-daemon/data
___________________________________________________________________
Name: svn:ignore
- Makefile.in
Makefile
notification-daemon.schemas
+ Makefile.in
Makefile
notification-daemon.schemas
notification-daemon.service
Modified: trunk/notification-daemon/data/Makefile.am
===================================================================
--- trunk/notification-daemon/data/Makefile.am 2006-01-23 07:55:30 UTC (rev 2472)
+++ trunk/notification-daemon/data/Makefile.am 2006-01-23 08:28:25 UTC (rev 2473)
@@ -4,14 +4,15 @@
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
schemas_in_files = notification-daemon.schemas.in
schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+
@INTLTOOL_SCHEMAS_RULE@
+if GCONF_SCHEMAS_INSTALL
install-data-local:
- if test -z "$(DESTDIR)"; then \
- for p in $(schemas_DATA); do \
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
- done \
- fi
+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA)
+else
+install-data-local:
+endif
EXTRA_DIST = \
$(schemas_in_files) \
Added: trunk/notification-daemon/po/ChangeLog
===================================================================
Modified: trunk/notification-daemon/src/Makefile.am
===================================================================
--- trunk/notification-daemon/src/Makefile.am 2006-01-23 07:55:30 UTC (rev 2472)
+++ trunk/notification-daemon/src/Makefile.am 2006-01-23 08:28:25 UTC (rev 2473)
@@ -1,5 +1,3 @@
-EXTRA_DIST = notificationdaemon.xml
-
libexec_PROGRAMS = notification-daemon
notification_daemon_SOURCES = \
@@ -13,10 +11,14 @@
BUILT_SOURCES = notificationdaemon-dbus-glue.h
notificationdaemon-dbus-glue.h: notificationdaemon.xml
- dbus-binding-tool --mode=glib-server $(srcdir)/notificationdaemon.xml > notificationdaemon-dbus-glue.h
+ dbus-binding-tool --mode=glib-server \
+ $(srcdir)/notificationdaemon.xml > notificationdaemon-dbus-glue.h
INCLUDES = \
-I$(top_srcdir) \
$(NOTIFICATION_DAEMON_CFLAGS) \
-DENGINES_DIR=\"$(libdir)/notification-daemon/engines\"
+EXTRA_DIST = notificationdaemon.xml
+DISTCLEANFILES = \
+ notificationdaemon-dbus-glue.h
Deleted: trunk/notification-daemon/src/notifydaemon-dbus-glue.h
===================================================================
--- trunk/notification-daemon/src/notifydaemon-dbus-glue.h 2006-01-23 07:55:30 UTC (rev 2472)
+++ trunk/notification-daemon/src/notifydaemon-dbus-glue.h 2006-01-23 08:28:25 UTC (rev 2473)
@@ -1,179 +0,0 @@
-/* Generated by dbus-binding-tool; do not edit! */
-
-
-#ifndef __dbus_glib_marshal__MARSHAL_H__
-#define __dbus_glib_marshal__MARSHAL_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#ifdef G_ENABLE_DEBUG
-#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v) g_value_get_char (v)
-#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
-#define g_marshal_value_peek_int(v) g_value_get_int (v)
-#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
-#define g_marshal_value_peek_long(v) g_value_get_long (v)
-#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v)
-#define g_marshal_value_peek_int64(v) g_value_get_int64 (v)
-#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v)
-#define g_marshal_value_peek_enum(v) g_value_get_enum (v)
-#define g_marshal_value_peek_flags(v) g_value_get_flags (v)
-#define g_marshal_value_peek_float(v) g_value_get_float (v)
-#define g_marshal_value_peek_double(v) g_value_get_double (v)
-#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v)
-#define g_marshal_value_peek_param(v) g_value_get_param (v)
-#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
-#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)
-#define g_marshal_value_peek_object(v) g_value_get_object (v)
-#else /* !G_ENABLE_DEBUG */
-/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
- * Do not access GValues directly in your code. Instead, use the
- * g_value_get_*() functions
- */
-#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int
-#define g_marshal_value_peek_char(v) (v)->data[0].v_int
-#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint
-#define g_marshal_value_peek_int(v) (v)->data[0].v_int
-#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint
-#define g_marshal_value_peek_long(v) (v)->data[0].v_long
-#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong
-#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64
-#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64
-#define g_marshal_value_peek_enum(v) (v)->data[0].v_long
-#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong
-#define g_marshal_value_peek_float(v) (v)->data[0].v_float
-#define g_marshal_value_peek_double(v) (v)->data[0].v_double
-#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer
-#endif /* !G_ENABLE_DEBUG */
-
-
-/* NONE:STRING,STRING,UINT,STRING,STRING,BOXED,BOXED,INT,POINTER (/tmp/dbus-binding-tool-c-marshallers.DKIhPQ:1) */
-extern void dbus_glib_marshal__VOID__STRING_STRING_UINT_STRING_STRING_BOXED_BOXED_INT_POINTER (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-void
-dbus_glib_marshal__VOID__STRING_STRING_UINT_STRING_STRING_BOXED_BOXED_INT_POINTER (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
-{
- typedef void (*GMarshalFunc_VOID__STRING_STRING_UINT_STRING_STRING_BOXED_BOXED_INT_POINTER) (gpointer data1,
- gpointer arg_1,
- gpointer arg_2,
- guint arg_3,
- gpointer arg_4,
- gpointer arg_5,
- gpointer arg_6,
- gpointer arg_7,
- gint arg_8,
- gpointer arg_9,
- gpointer data2);
- register GMarshalFunc_VOID__STRING_STRING_UINT_STRING_STRING_BOXED_BOXED_INT_POINTER callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
-
- g_return_if_fail (n_param_values == 10);
-
- 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_VOID__STRING_STRING_UINT_STRING_STRING_BOXED_BOXED_INT_POINTER) (marshal_data ? marshal_data : cc->callback);
-
- callback (data1,
- g_marshal_value_peek_string (param_values + 1),
- g_marshal_value_peek_string (param_values + 2),
- g_marshal_value_peek_uint (param_values + 3),
- g_marshal_value_peek_string (param_values + 4),
- g_marshal_value_peek_string (param_values + 5),
- g_marshal_value_peek_boxed (param_values + 6),
- g_marshal_value_peek_boxed (param_values + 7),
- g_marshal_value_peek_int (param_values + 8),
- g_marshal_value_peek_pointer (param_values + 9),
- data2);
-}
-#define dbus_glib_marshal__NONE__STRING_STRING_UINT_STRING_STRING_BOXED_BOXED_INT_POINTER dbus_glib_marshal__VOID__STRING_STRING_UINT_STRING_STRING_BOXED_BOXED_INT_POINTER
-
-/* BOOLEAN:UINT,POINTER (/tmp/dbus-binding-tool-c-marshallers.DKIhPQ:2) */
-extern void dbus_glib_marshal__BOOLEAN__UINT_POINTER (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-void
-dbus_glib_marshal__BOOLEAN__UINT_POINTER (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
-{
- typedef gboolean (*GMarshalFunc_BOOLEAN__UINT_POINTER) (gpointer data1,
- guint arg_1,
- gpointer arg_2,
- gpointer data2);
- register GMarshalFunc_BOOLEAN__UINT_POINTER callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
- gboolean v_return;
-
- g_return_if_fail (return_value != NULL);
- g_return_if_fail (n_param_values == 3);
-
- 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__UINT_POINTER) (marshal_data ? marshal_data : cc->callback);
-
- v_return = callback (data1,
- g_marshal_value_peek_uint (param_values + 1),
- g_marshal_value_peek_pointer (param_values + 2),
- data2);
-
- g_value_set_boolean (return_value, v_return);
-}
-
-G_END_DECLS
-
-#endif /* __dbus_glib_marshal__MARSHAL_H__ */
-
-#include <dbus/dbus-glib.h>
-static const DBusGMethodInfo dbus_glib__methods[] = {
- { (GCallback) notify_daemon_notify_handler, dbus_glib_marshal__NONE__STRING_STRING_UINT_STRING_STRING_BOXED_BOXED_INT_POINTER, 0 },
- { (GCallback) notify_daemon_close_notification_handler, dbus_glib_marshal__BOOLEAN__UINT_POINTER, 148 },
-};
-
-const DBusGObjectInfo dbus_glib__object_info = {
- 0,
- dbus_glib__methods,
- 2,
-"org.freedesktop.Notifications\0Notify\0A\0app_name\0I\0s\0icon\0I\0s\0id\0I\0u\0trouble\0I\0s\0d_ret\0I\0s\0str_ret\0I\0as\0hints\0I\0a{sv}\0timeout\0I\0i\0return_id\0O\0F\0N\0u\0\0org.freedesktop.Notifications\0CloseNotification\0S\0id\0I\0u\0\0\0",
-"\0",
-"\0"
-};
-
More information about the galago-commits
mailing list