diff options
Diffstat (limited to 'tests/test-libappindicator-status-client.c')
| -rw-r--r-- | tests/test-libappindicator-status-client.c | 213 |
1 files changed, 112 insertions, 101 deletions
diff --git a/tests/test-libappindicator-status-client.c b/tests/test-libappindicator-status-client.c index cd60e6c..beeeaad 100644 --- a/tests/test-libappindicator-status-client.c +++ b/tests/test-libappindicator-status-client.c @@ -3,9 +3,11 @@ Tests for the libappindicator library that are over DBus. This is the client side of those tests. Copyright 2009 Canonical Ltd. +Copyright 2023 Robert Tari Authors: Ted Gould <ted@canonical.com> + Robert Tari <robert@tari.in> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 3, as published @@ -20,11 +22,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ - #include <glib.h> -#include <dbus/dbus-glib.h> -#include <dbus/dbus-glib-bindings.h> -#include <dbus/dbus-glib-lowlevel.h> +#include <gio/gio.h> #include "../src/dbus-shared.h" static GMainLoop * mainloop = NULL; @@ -37,115 +36,127 @@ static guint toggle_count = 0; #define ACTIVE_STR "Active" #define ATTN_STR "NeedsAttention" -static DBusHandlerResult -dbus_reg_filter (DBusConnection * connection, DBusMessage * message, void * user_data) +static GDBusMessage* dbus_reg_filter (GDBusConnection *pConnection, GDBusMessage *pMessage, gboolean bIncoming, void *pUserData) { - if (dbus_message_is_method_call(message, NOTIFICATION_WATCHER_DBUS_ADDR, "RegisterStatusNotifierItem")) { - DBusMessage * reply = dbus_message_new_method_return(message); - dbus_connection_send(connection, reply, NULL); - dbus_message_unref(reply); - return DBUS_HANDLER_RESULT_HANDLED; - } - - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + GDBusMessageType cType = g_dbus_message_get_message_type (pMessage); + const gchar *sInterface = g_dbus_message_get_interface (pMessage); + const gchar *sMember = g_dbus_message_get_member (pMessage); + int nInterfaceComp = g_strcmp0 (sInterface, NOTIFICATION_WATCHER_DBUS_ADDR); + int nMemberComp = g_strcmp0 (sMember, "RegisterStatusNotifierItem"); + + if (cType == G_DBUS_MESSAGE_TYPE_METHOD_CALL && nInterfaceComp == 0 && nMemberComp == 0) + { + GDBusMessage *pReply = g_dbus_message_new_method_reply (pMessage); + g_dbus_connection_send_message (pConnection, pReply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL); + g_object_unref (pReply); + + g_object_unref (pMessage); + pMessage = NULL; + } + + return pMessage; } - -static DBusHandlerResult -dbus_filter (DBusConnection * connection, DBusMessage * message, void * user_data) +void onNewStatus (GDBusConnection* pConnection, const gchar *sSender, const gchar *sPath, const gchar *sInterface, const gchar *sSignal, GVariant *pParameters, gpointer pUserData) { - if (!dbus_message_is_signal(message, NOTIFICATION_ITEM_DBUS_IFACE, "NewStatus")) { - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - } - - gchar * string; - - DBusError derror; - dbus_error_init(&derror); - if (!dbus_message_get_args(message, &derror, - DBUS_TYPE_STRING, &string, - DBUS_TYPE_INVALID)) { - g_warning("Couldn't get parameters"); - dbus_error_free(&derror); - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - } - - watchdog_hit = TRUE; - - if (g_strcmp0(string, ACTIVE_STR) == 0) { - if (active) { - g_warning("Got active when already active"); - passed = FALSE; - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - } - active = TRUE; - } else { - active = FALSE; - } - - toggle_count++; - - if (toggle_count == 100) { - g_main_loop_quit(mainloop); - } - - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + const gchar *sParam = NULL; + g_variant_get (pParameters, "(s)", &sParam); + + if (!sParam) + { + g_warning ("Couldn't get parameter"); + + return; + } + + watchdog_hit = TRUE; + int nComp = g_strcmp0 (sParam, ACTIVE_STR); + + if (!nComp) + { + if (active) + { + g_warning ("Got active when already active"); + passed = FALSE; + + return; + } + + active = TRUE; + } + else + { + active = FALSE; + } + + toggle_count++; + + if (toggle_count == 100) + { + g_main_loop_quit (mainloop); + } } gboolean kill_func (gpointer userdata) { - if (watchdog_hit == FALSE) { - g_main_loop_quit(mainloop); - g_warning("Forced to Kill"); - g_warning("Toggle count: %d", toggle_count); - passed = FALSE; - return FALSE; - } - watchdog_hit = FALSE; - return TRUE; + if (watchdog_hit == FALSE) { + g_main_loop_quit(mainloop); + g_warning("Forced to Kill"); + g_warning("Toggle count: %d", toggle_count); + passed = FALSE; + return FALSE; + } + watchdog_hit = FALSE; + return TRUE; } gint main (gint argc, gchar * argv[]) { - GError * error = NULL; - DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error); - if (error != NULL) { - g_error("Unable to get session bus: %s", error->message); - return 1; - } - - DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(session_bus, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); - guint nameret = 0; - - if (!org_freedesktop_DBus_request_name(bus_proxy, NOTIFICATION_WATCHER_DBUS_ADDR, 0, &nameret, &error)) { - g_error("Unable to call to request name"); - return 1; - } - - if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { - g_error("Unable to get name"); - return 1; - } - - dbus_connection_add_filter(dbus_g_connection_get_connection(session_bus), dbus_reg_filter, NULL, NULL); - - dbus_connection_add_filter(dbus_g_connection_get_connection(session_bus), dbus_filter, NULL, NULL); - dbus_bus_add_match(dbus_g_connection_get_connection(session_bus), "type='signal',interface='" NOTIFICATION_ITEM_DBUS_IFACE "',member='NewStatus'", NULL); - - watchdog_hit = TRUE; - g_timeout_add_seconds(20, kill_func, NULL); - - mainloop = g_main_loop_new(NULL, FALSE); - g_main_loop_run(mainloop); - - if (passed) { - g_debug("Quiting"); - return 0; - } else { - g_debug("Quiting as we're a failure"); - return 1; - } - return 0; + GError *pError = NULL; + GDBusProxy *pProxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_NONE, NULL, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, NULL, &pError); + + if (pError != NULL) + { + g_error("Unable to get session bus: %s", pError->message); + g_error_free (pError); + + return 1; + } + + GDBusConnection *pConnection = g_dbus_proxy_get_connection (pProxy); + guint nName = g_bus_own_name_on_connection (pConnection, NOTIFICATION_WATCHER_DBUS_ADDR, G_BUS_NAME_OWNER_FLAGS_NONE, NULL, NULL, NULL, NULL); + + if (!nName) + { + g_error ("Unable to call to request name"); + + return 1; + } + + if (nName != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) + { + g_error ("Unable to get name"); + + return 1; + } + + g_dbus_connection_add_filter (pConnection, dbus_reg_filter, NULL, NULL); + g_dbus_connection_signal_subscribe (pConnection, NULL, NOTIFICATION_ITEM_DBUS_IFACE, "NewStatus", NULL, NULL, G_DBUS_SIGNAL_FLAGS_NONE, onNewStatus, NULL, NULL); + + watchdog_hit = TRUE; + g_timeout_add_seconds(20, kill_func, NULL); + + mainloop = g_main_loop_new(NULL, FALSE); + g_main_loop_run(mainloop); + + if (passed) { + g_debug("Quiting"); + return 0; + } else { + g_debug("Quiting as we're a failure"); + return 1; + } + return 0; } |