diff options
| author | Ted Gould <ted@gould.cx> | 2010-02-10 10:37:53 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-02-10 10:37:53 -0600 |
| commit | 8418f3a96bd138f89e392b2604aabf9bbda3d88a (patch) | |
| tree | ac677201f53ac412e93462723e630126b6f839c9 | |
| parent | aafaa311dfe8548c8e2680ab98ee865ea75abc63 (diff) | |
| download | libayatana-appindicator-8418f3a96bd138f89e392b2604aabf9bbda3d88a.tar.gz libayatana-appindicator-8418f3a96bd138f89e392b2604aabf9bbda3d88a.tar.bz2 libayatana-appindicator-8418f3a96bd138f89e392b2604aabf9bbda3d88a.zip | |
Changing to ID based naming and setting a menu to get init
| -rw-r--r-- | tests/test-libappindicator-dbus-client.c | 2 | ||||
| -rw-r--r-- | tests/test-libappindicator-dbus-server.c | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/tests/test-libappindicator-dbus-client.c b/tests/test-libappindicator-dbus-client.c index 5a7107f..6125d36 100644 --- a/tests/test-libappindicator-dbus-client.c +++ b/tests/test-libappindicator-dbus-client.c @@ -200,7 +200,7 @@ main (gint argc, gchar * argv[]) DBusGProxy * props = dbus_g_proxy_new_for_name_owner(session_bus, ":1.0", - "/org/ayatana/NotificationItem", + "/org/ayatana/NotificationItem/my_id", DBUS_INTERFACE_PROPERTIES, &error); if (error != NULL) { diff --git a/tests/test-libappindicator-dbus-server.c b/tests/test-libappindicator-dbus-server.c index cc072aa..76f0e50 100644 --- a/tests/test-libappindicator-dbus-server.c +++ b/tests/test-libappindicator-dbus-server.c @@ -23,7 +23,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> -#include <glib.h> +#include <gtk/gtk.h> #include <libappindicator/app-indicator.h> #include "test-defines.h" @@ -39,13 +39,19 @@ kill_func (gpointer userdata) gint main (gint argc, gchar * argv[]) { - g_type_init(); + gtk_init(&argc, &argv); g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL)))); AppIndicator * ci = app_indicator_new (TEST_ID, TEST_ICON_NAME, TEST_CATEGORY); - app_indicator_set_status (ci, TEST_STATE); - app_indicator_set_attention_icon (ci, TEST_ATTENTION_ICON_NAME); + app_indicator_set_status (ci, TEST_STATE); + app_indicator_set_attention_icon (ci, TEST_ATTENTION_ICON_NAME); + + GtkMenu * menu = GTK_MENU(gtk_menu_new()); + GtkMenuItem * item = GTK_MENU_ITEM(gtk_menu_item_new_with_label("Label")); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(item)); + + app_indicator_set_menu(ci, menu); g_timeout_add_seconds(2, kill_func, NULL); |