diff --git a/ChangeLog b/ChangeLog index 1d11900..c6320e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Jan 10 22:55:35 PST 2006 Christian Hammond + + * tests/test-default-action.c: + * tools/notify-send.c: + - Fix some C99 usage. + Tue Jan 10 16:20:27 MST 2006 David Trowbridge * libnotify/Makefile.am: diff --git a/tests/test-default-action.c b/tests/test-default-action.c index 41511bc..d452aa0 100644 --- a/tests/test-default-action.c +++ b/tests/test-default-action.c @@ -49,10 +49,11 @@ int 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); diff --git a/tools/notify-send.c b/tools/notify-send.c index d40e4cf..2a459ae 100644 --- a/tools/notify-send.c +++ b/tools/notify-send.c @@ -44,8 +44,6 @@ main(int argc, const char **argv) 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 @@ main(int argc, const char **argv) POPT_TABLEEND }; + g_type_init (); + opt_ctx = poptGetContext("notify-send", argc, argv, options, 0); poptSetOtherOptionHelp(opt_ctx, "[OPTIONS]* [body]");