[Galago-commits] r2408 - in trunk/libnotify-ng: . tests tools

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-01-10 22:56:38 -0800 (Tue, 10 Jan 2006)
New Revision: 2408

Modified:
   trunk/libnotify-ng/ChangeLog
   trunk/libnotify-ng/tests/test-default-action.c
   trunk/libnotify-ng/tools/notify-send.c
Log:
Fix some C99 usage.


Modified: trunk/libnotify-ng/ChangeLog
===================================================================
--- trunk/libnotify-ng/ChangeLog	2006-01-11 06:51:43 UTC (rev 2407)
+++ trunk/libnotify-ng/ChangeLog	2006-01-11 06:56:38 UTC (rev 2408)
@@ -1,3 +1,9 @@
+Tue Jan 10 22:55:35 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* tests/test-default-action.c:
+	* tools/notify-send.c:
+	  - Fix some C99 usage.
+
 Tue Jan 10 16:20:27 MST 2006  David Trowbridge <trowbrds at gmail.com>
 
 	* libnotify/Makefile.am:

Modified: trunk/libnotify-ng/tests/test-default-action.c
===================================================================
--- trunk/libnotify-ng/tests/test-default-action.c	2006-01-11 06:51:43 UTC (rev 2407)
+++ trunk/libnotify-ng/tests/test-default-action.c	2006-01-11 06:56:38 UTC (rev 2408)
@@ -49,10 +49,11 @@
 main()
 {
         NotifyNotification *n;
+	DBusConnection *conn;
 
 	if (!notify_init("Default Action Test")) exit(1);
 
-	DBusConnection *conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
+	conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
 	loop = g_main_loop_new(NULL, FALSE);
 
 	dbus_connection_setup_with_g_main(conn, NULL);

Modified: trunk/libnotify-ng/tools/notify-send.c
===================================================================
--- trunk/libnotify-ng/tools/notify-send.c	2006-01-11 06:51:43 UTC (rev 2407)
+++ trunk/libnotify-ng/tools/notify-send.c	2006-01-11 06:56:38 UTC (rev 2408)
@@ -44,8 +44,6 @@
 	const char **args;
         NotifyNotification *notify;
 
-        g_type_init (); 
-
 	struct poptOption options[] =
 	{
 		{ "urgency", 'u', POPT_ARG_STRING | POPT_ARGFLAG_STRIP, &urgency_str,
@@ -66,6 +64,8 @@
 		POPT_TABLEEND
 	};
 
+        g_type_init (); 
+
 	opt_ctx = poptGetContext("notify-send", argc, argv, options, 0);
 	poptSetOtherOptionHelp(opt_ctx, "[OPTIONS]* <summary> [body]");