aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.bzrignore3
-rw-r--r--configure.ac4
-rw-r--r--debian/changelog13
-rw-r--r--example/simple-client.c24
-rw-r--r--src/application-service-appstore.c2
-rw-r--r--src/indicator-application.c218
-rw-r--r--src/libappindicator/app-indicator.c44
-rw-r--r--tests/Makefile.am43
-rw-r--r--tests/test-libappindicator-status-client.c123
-rw-r--r--tests/test-libappindicator-status-server.c76
10 files changed, 492 insertions, 58 deletions
diff --git a/.bzrignore b/.bzrignore
index a218817..24a0402 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -90,3 +90,6 @@ src/libappindicator/appindicator-0.1.pc
tests/test-libappindicator-fallback-item
tests/test-libappindicator-fallback-watcher
tests/test-libappindicator-fallback
+tests/test-libappindicator-status
+tests/test-libappindicator-status-client
+tests/test-libappindicator-status-server
diff --git a/configure.ac b/configure.ac
index 07bff83..152b91b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT(indicator-application, 0.0.11, ted@canonical.com)
+AC_INIT(indicator-application, 0.0.12, ted@canonical.com)
AC_COPYRIGHT([Copyright 2009, 2010 Canonical])
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-application, 0.0.11)
+AM_INIT_AUTOMAKE(indicator-application, 0.0.12)
AM_MAINTAINER_MODE
diff --git a/debian/changelog b/debian/changelog
index c7b4ff7..adbf414 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+indicator-application (0.0.12-0ubuntu1~ppa1) UNRELEASED; urgency=low
+
+ * Upstream release 0.0.12
+ * Handling the service restarting better by removing the icons
+ after a small delay to ensure they don't return.
+ * Fixing a crash where a proxy was created while the previous
+ one was being destroyed.
+ * Fixing copying of the attention icon
+ * Adding status changing to the example application
+ * Adding a test for status changing getting sent over DBus.
+
+ -- Ted Gould <ted@ubuntu.com> Mon, 08 Feb 2010 09:56:35 -0600
+
indicator-application (0.0.11-0ubuntu1) lucid; urgency=low
* debian/control:
diff --git a/example/simple-client.c b/example/simple-client.c
index 6dcf5d1..f1b8d37 100644
--- a/example/simple-client.c
+++ b/example/simple-client.c
@@ -25,6 +25,24 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include "libdbusmenu-glib/menuitem.h"
GMainLoop * mainloop = NULL;
+static gboolean active = TRUE;
+
+static void
+activate_clicked_cb (GtkWidget *widget, gpointer data)
+{
+ AppIndicator * ci = APP_INDICATOR(data);
+
+ if (active) {
+ app_indicator_set_status (ci, APP_INDICATOR_STATUS_ATTENTION);
+ gtk_menu_item_set_label(GTK_MENU_ITEM(widget), "I'm okay now");
+ active = FALSE;
+ } else {
+ app_indicator_set_status (ci, APP_INDICATOR_STATUS_ACTIVE);
+ gtk_menu_item_set_label(GTK_MENU_ITEM(widget), "Get Attention");
+ active = TRUE;
+ }
+
+}
static void
item_clicked_cb (GtkWidget *widget, gpointer data)
@@ -99,6 +117,12 @@ main (int argc, char ** argv)
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show(item);
+ item = gtk_menu_item_new_with_label ("Get Attention");
+ g_signal_connect (item, "activate",
+ G_CALLBACK (activate_clicked_cb), ci);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ gtk_widget_show(item);
+
app_indicator_set_menu (ci, GTK_MENU (menu));
mainloop = g_main_loop_new(NULL, FALSE);
diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c
index 70fab18..c784495 100644
--- a/src/application-service-appstore.c
+++ b/src/application-service-appstore.c
@@ -224,7 +224,7 @@ get_all_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError * err
app->icon = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_NAME));
app->menu = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_MENU));
if (g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_AICON_NAME) != NULL) {
- app->aicon = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_NAME));
+ app->aicon = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_AICON_NAME));
}
gpointer icon_path_data = g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_PATH);
diff --git a/src/indicator-application.c b/src/indicator-application.c
index 6c053a9..170e0d4 100644
--- a/src/indicator-application.c
+++ b/src/indicator-application.c
@@ -78,12 +78,16 @@ struct _IndicatorApplicationPrivate {
DBusGProxy * service_proxy;
GList * applications;
GHashTable * theme_dirs;
+ guint disconnect_kill;
};
typedef struct _ApplicationEntry ApplicationEntry;
struct _ApplicationEntry {
IndicatorObjectEntry entry;
gchar * icon_path;
+ gboolean old_service;
+ gchar * dbusobject;
+ gchar * dbusaddress;
};
#define INDICATOR_APPLICATION_GET_PRIVATE(o) \
@@ -95,7 +99,12 @@ static void indicator_application_dispose (GObject *object);
static void indicator_application_finalize (GObject *object);
static GList * get_entries (IndicatorObject * io);
static guint get_location (IndicatorObject * io, IndicatorObjectEntry * entry);
-static void connected (IndicatorServiceManager * sm, gboolean connected, IndicatorApplication * application);
+void connection_changed (IndicatorServiceManager * sm, gboolean connected, IndicatorApplication * application);
+static void connected (IndicatorApplication * application);
+static void disconnected (IndicatorApplication * application);
+static void disconnected_helper (gpointer data, gpointer user_data);
+static gboolean disconnected_kill (gpointer user_data);
+static void disconnected_kill_helper (gpointer data, gpointer user_data);
static void application_added (DBusGProxy * proxy, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_path, IndicatorApplication * application);
static void application_removed (DBusGProxy * proxy, gint position , IndicatorApplication * application);
static void application_icon_changed (DBusGProxy * proxy, gint position, const gchar * iconname, IndicatorApplication * application);
@@ -147,9 +156,10 @@ indicator_application_init (IndicatorApplication *self)
priv->bus = NULL;
priv->service_proxy = NULL;
priv->theme_dirs = NULL;
+ priv->disconnect_kill = 0;
priv->sm = indicator_service_manager_new(INDICATOR_APPLICATION_DBUS_ADDR);
- g_signal_connect(G_OBJECT(priv->sm), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connected), self);
+ g_signal_connect(G_OBJECT(priv->sm), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_changed), self);
priv->applications = NULL;
@@ -163,6 +173,10 @@ indicator_application_dispose (GObject *object)
{
IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(object);
+ if (priv->disconnect_kill != 0) {
+ g_source_remove(priv->disconnect_kill);
+ }
+
while (priv->applications != NULL) {
application_removed(priv->service_proxy,
0,
@@ -205,8 +219,24 @@ indicator_application_finalize (GObject *object)
return;
}
+/* Responds to connection change event from the service manager and
+ splits it into two. */
void
-connected (IndicatorServiceManager * sm, gboolean connected, IndicatorApplication * application)
+connection_changed (IndicatorServiceManager * sm, gboolean connect, IndicatorApplication * application)
+{
+ g_return_if_fail(IS_INDICATOR_APPLICATION(application));
+ if (connect) {
+ connected(application);
+ } else {
+ disconnected(application);
+ }
+ return;
+}
+
+/* Brings up the connection to a service that has just come onto the
+ bus, or is atleast new to us. */
+void
+connected (IndicatorApplication * application)
{
IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application);
g_debug("Connected to Application Indicator Service.");
@@ -224,50 +254,51 @@ connected (IndicatorServiceManager * sm, gboolean connected, IndicatorApplicatio
}
}
+ if (priv->service_proxy == NULL) {
/* Build the service proxy */
- priv->service_proxy = dbus_g_proxy_new_for_name_owner(priv->bus,
- INDICATOR_APPLICATION_DBUS_ADDR,
- INDICATOR_APPLICATION_DBUS_OBJ,
- INDICATOR_APPLICATION_DBUS_IFACE,
- &error);
-
- /* Set up proxy signals */
- g_debug("Setup proxy signals");
- dbus_g_proxy_add_signal(priv->service_proxy,
- "ApplicationAdded",
- G_TYPE_STRING,
- G_TYPE_INT,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_INVALID);
- dbus_g_proxy_add_signal(priv->service_proxy,
- "ApplicationRemoved",
- G_TYPE_INT,
- G_TYPE_INVALID);
- dbus_g_proxy_add_signal(priv->service_proxy,
- "ApplicationIconChanged",
- G_TYPE_INT,
- G_TYPE_STRING,
- G_TYPE_INVALID);
-
- /* Connect to them */
- g_debug("Connect to them.");
- dbus_g_proxy_connect_signal(priv->service_proxy,
- "ApplicationAdded",
- G_CALLBACK(application_added),
- application,
- NULL /* Disconnection Signal */);
- dbus_g_proxy_connect_signal(priv->service_proxy,
- "ApplicationRemoved",
- G_CALLBACK(application_removed),
- application,
- NULL /* Disconnection Signal */);
- dbus_g_proxy_connect_signal(priv->service_proxy,
- "ApplicationIconChanged",
- G_CALLBACK(application_icon_changed),
- application,
- NULL /* Disconnection Signal */);
+ priv->service_proxy = dbus_g_proxy_new_for_name(priv->bus,
+ INDICATOR_APPLICATION_DBUS_ADDR,
+ INDICATOR_APPLICATION_DBUS_OBJ,
+ INDICATOR_APPLICATION_DBUS_IFACE);
+
+ /* Set up proxy signals */
+ g_debug("Setup proxy signals");
+ dbus_g_proxy_add_signal(priv->service_proxy,
+ "ApplicationAdded",
+ G_TYPE_STRING,
+ G_TYPE_INT,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_INVALID);
+ dbus_g_proxy_add_signal(priv->service_proxy,
+ "ApplicationRemoved",
+ G_TYPE_INT,
+ G_TYPE_INVALID);
+ dbus_g_proxy_add_signal(priv->service_proxy,
+ "ApplicationIconChanged",
+ G_TYPE_INT,
+ G_TYPE_STRING,
+ G_TYPE_INVALID);
+
+ /* Connect to them */
+ g_debug("Connect to them.");
+ dbus_g_proxy_connect_signal(priv->service_proxy,
+ "ApplicationAdded",
+ G_CALLBACK(application_added),
+ application,
+ NULL /* Disconnection Signal */);
+ dbus_g_proxy_connect_signal(priv->service_proxy,
+ "ApplicationRemoved",
+ G_CALLBACK(application_removed),
+ application,
+ NULL /* Disconnection Signal */);
+ dbus_g_proxy_connect_signal(priv->service_proxy,
+ "ApplicationIconChanged",
+ G_CALLBACK(application_icon_changed),
+ application,
+ NULL /* Disconnection Signal */);
+ }
/* Query it for existing applications */
g_debug("Request current apps");
@@ -278,6 +309,57 @@ connected (IndicatorServiceManager * sm, gboolean connected, IndicatorApplicatio
return;
}
+/* Marks every current application as belonging to the old
+ service so that we can delete it if it doesn't come back.
+ Also, sets up a timeout on comming back. */
+static void
+disconnected (IndicatorApplication * application)
+{
+ IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application);
+ g_list_foreach(priv->applications, disconnected_helper, application);
+ /* I'll like this to be a little shorter, but it's a bit
+ inpractical to make it so. This means that the user will
+ probably notice a visible glitch. Though, if applications
+ are disappearing there isn't much we can do. */
+ priv->disconnect_kill = g_timeout_add(250, disconnected_kill, application);
+ return;
+}
+
+/* Marks an entry as being from the old service */
+static void
+disconnected_helper (gpointer data, gpointer user_data)
+{
+ ApplicationEntry * entry = (ApplicationEntry *)data;
+ entry->old_service = TRUE;
+ return;
+}
+
+/* Makes sure the old applications that don't come back
+ get dropped. */
+static gboolean
+disconnected_kill (gpointer user_data)
+{
+ g_return_val_if_fail(IS_INDICATOR_APPLICATION(user_data), FALSE);
+ IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(user_data);
+ priv->disconnect_kill = 0;
+ g_list_foreach(priv->applications, disconnected_kill_helper, user_data);
+ return FALSE;
+}
+
+/* Looks for entries that are still associated with the
+ old service and removes them. */
+static void
+disconnected_kill_helper (gpointer data, gpointer user_data)
+{
+ g_return_if_fail(IS_INDICATOR_APPLICATION(user_data));
+ IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(user_data);
+ ApplicationEntry * entry = (ApplicationEntry *)data;
+ if (entry->old_service) {
+ application_removed(NULL, g_list_index(priv->applications, data), INDICATOR_APPLICATION(user_data));
+ }
+ return;
+}
+
/* Goes through the list of applications that we're maintaining and
pulls out the IndicatorObjectEntry and returns that in a list
for the caller. */
@@ -311,22 +393,57 @@ get_location (IndicatorObject * io, IndicatorObjectEntry * entry)
return g_list_index(priv->applications, entry);
}
+/* Searching for ApplicationEntries where the dbusobject and
+ address are the same. */
+static gint
+application_added_search (gconstpointer a, gconstpointer b)
+{
+ ApplicationEntry * appa = (ApplicationEntry *)a;
+ ApplicationEntry * appb = (ApplicationEntry *)b;
+
+ if (g_strcmp0(appa->dbusaddress, appb->dbusaddress) == 0 &&
+ g_strcmp0(appa->dbusobject, appb->dbusobject) == 0) {
+ return 0;
+ }
+
+ return -1;
+}
+
/* Here we respond to new applications by building up the
ApplicationEntry and signaling the indicator host that
we've got a new indicator. */
static void
application_added (DBusGProxy * proxy, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_path, IndicatorApplication * application)
{
+ g_return_if_fail(IS_INDICATOR_APPLICATION(application));
g_debug("Building new application entry: %s with icon: %s", dbusaddress, iconname);
IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application);
+
+ /* First search to see if we already have this entry */
+ ApplicationEntry searchapp;
+ searchapp.dbusaddress = (gchar *)dbusaddress; /* Casting off const, but it's okay, we're not changing it */
+ searchapp.dbusobject = (gchar *)dbusobject; /* Casting off const, but it's okay, we're not changing it */
+
+ GList * searchpointer = g_list_find_custom(priv->applications, &searchapp, application_added_search);
+ if (searchpointer != NULL) {
+ g_debug("\t...Already have that one.");
+ ApplicationEntry * app = (ApplicationEntry *)searchpointer->data;
+ app->old_service = FALSE;
+ return;
+ }
+
ApplicationEntry * app = g_new(ApplicationEntry, 1);
+ app->old_service = FALSE;
app->icon_path = NULL;
if (icon_path != NULL && icon_path[0] != '\0') {
app->icon_path = g_strdup(icon_path);
theme_dir_ref(application, icon_path);
}
+ app->dbusaddress = g_strdup(dbusaddress);
+ app->dbusobject = g_strdup(dbusobject);
+
/* We make a long name using the suffix, and if that
icon is available we want to use it. Otherwise we'll
just use the name we were given. */
@@ -359,6 +476,7 @@ application_added (DBusGProxy * proxy, const gchar * iconname, gint position, co
static void
application_removed (DBusGProxy * proxy, gint position, IndicatorApplication * application)
{
+ g_return_if_fail(IS_INDICATOR_APPLICATION(application));
IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application);
ApplicationEntry * app = (ApplicationEntry *)g_list_nth_data(priv->applications, position);
@@ -374,6 +492,12 @@ application_removed (DBusGProxy * proxy, gint position, IndicatorApplication * a
theme_dir_unref(application, app->icon_path);
g_free(app->icon_path);
}
+ if (app->dbusaddress != NULL) {
+ g_free(app->dbusaddress);
+ }
+ if (app->dbusobject != NULL) {
+ g_free(app->dbusobject);
+ }
if (app->entry.image != NULL) {
g_object_unref(G_OBJECT(app->entry.image));
}
@@ -407,8 +531,10 @@ application_icon_changed (DBusGProxy * proxy, gint position, const gchar * iconn
just use the name we were given. */
gchar * longname = g_strdup_printf("%s-%s", iconname, PANEL_ICON_SUFFIX);
if (gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), longname)) {
+ g_debug("Setting icon on %d to %s", position, longname);
gtk_image_set_from_icon_name(app->entry.image, longname, GTK_ICON_SIZE_MENU);
} else {
+ g_debug("Setting icon on %d to %s", position, iconname);
gtk_image_set_from_icon_name(app->entry.image, iconname, GTK_ICON_SIZE_MENU);
}
g_free(longname);
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index 908684f..426ee8c 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -330,6 +330,7 @@ app_indicator_init (AppIndicator *self)
g_error_free(error);
return;
}
+ dbus_g_connection_ref(priv->connection);
dbus_g_connection_register_g_object(priv->connection,
DEFAULT_ITEM_PATH,
@@ -386,6 +387,11 @@ app_indicator_dispose (GObject *object)
priv->watcher_proxy = NULL;
}
+ if (priv->connection != NULL) {
+ dbus_g_connection_unref(priv->connection);
+ priv->connection = NULL;
+ }
+
G_OBJECT_CLASS (app_indicator_parent_class)->dispose (object);
return;
}
@@ -684,6 +690,33 @@ dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, c
return;
}
+/* This is an idle function to create the proxy. This is mostly
+ because start_fallback_timer can get called in the distruction
+ of a proxy and thus the proxy manager gets confused when creating
+ a new proxy as part of destroying an old one. This function being
+ on idle means that we'll just do it outside of the same stack where
+ the previous proxy is being destroyed. */
+static gboolean
+setup_name_owner_proxy (gpointer data)
+{
+ g_return_val_if_fail(IS_APP_INDICATOR(data), FALSE);
+ AppIndicatorPrivate * priv = APP_INDICATOR(data)->priv;
+
+ if (priv->dbus_proxy == NULL) {
+ priv->dbus_proxy = dbus_g_proxy_new_for_name(priv->connection,
+ DBUS_SERVICE_DBUS,
+ DBUS_PATH_DBUS,
+ DBUS_INTERFACE_DBUS);
+ dbus_g_proxy_add_signal(priv->dbus_proxy, "NameOwnerChanged",
+ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
+ G_TYPE_INVALID);
+ dbus_g_proxy_connect_signal(priv->dbus_proxy, "NameOwnerChanged",
+ G_CALLBACK(dbus_owner_change), data, NULL);
+ }
+
+ return FALSE;
+}
+
/* A function that will start the fallback timer if it's not
already started. It sets up the DBus watcher to see if
there is a change. Also, provides an override mode for cases
@@ -701,15 +734,8 @@ start_fallback_timer (AppIndicator * self, gboolean disable_timeout)
}
if (priv->dbus_proxy == NULL) {
- priv->dbus_proxy = dbus_g_proxy_new_for_name(priv->connection,
- DBUS_SERVICE_DBUS,
- DBUS_PATH_DBUS,
- DBUS_INTERFACE_DBUS);
- dbus_g_proxy_add_signal(priv->dbus_proxy, "NameOwnerChanged",
- G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
- G_TYPE_INVALID);
- dbus_g_proxy_connect_signal(priv->dbus_proxy, "NameOwnerChanged",
- G_CALLBACK(dbus_owner_change), self, NULL);
+ /* NOTE: Read the comment on setup_name_owner_proxy */
+ g_idle_add(setup_name_owner_proxy, self);
}
if (disable_timeout) {
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 327c8cc..03e2091 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,6 +3,8 @@ check_PROGRAMS = \
test-libappindicator \
test-libappindicator-dbus-client \
test-libappindicator-dbus-server \
+ test-libappindicator-status-client \
+ test-libappindicator-status-server \
test-libappindicator-fallback-watcher \
test-libappindicator-fallback-item \
test-simple-app
@@ -63,6 +65,40 @@ test_libappindicator_dbus_server_LDADD = \
$(top_builddir)/src/libappindicator.la
#########################################
+## test-libappindicator-status-client
+#########################################
+
+test_libappindicator_status_client_SOURCES = \
+ test-defines.h \
+ test-libappindicator-status-client.c
+
+test_libappindicator_status_client_CFLAGS = \
+ $(INDICATOR_CFLAGS) \
+ -Wall -Werror \
+ -I$(top_srcdir)/src
+
+test_libappindicator_status_client_LDADD = \
+ $(INDICATOR_LIBS) \
+ $(top_builddir)/src/libappindicator.la
+
+#########################################
+## test-libappindicator-status-server
+#########################################
+
+test_libappindicator_status_server_SOURCES = \
+ test-defines.h \
+ test-libappindicator-status-server.c
+
+test_libappindicator_status_server_CFLAGS = \
+ $(INDICATOR_CFLAGS) \
+ -Wall -Werror \
+ -I$(top_srcdir)/src
+
+test_libappindicator_status_server_LDADD = \
+ $(INDICATOR_LIBS) \
+ $(top_builddir)/src/libappindicator.la
+
+#########################################
## test-libappindicator-fallback
#########################################
@@ -128,6 +164,13 @@ test-libappindicator-dbus: test-libappindicator-dbus-client test-libappindicator
TESTS += test-libappindicator-dbus
+test-libappindicator-status: test-libappindicator-status-client test-libappindicator-status-server Makefile.am
+ @echo "#!/bin/sh" > test-libappindicator-status
+ @echo $(DBUS_RUNNER) --task ./test-libappindicator-status-client --task-name Client --task ./test-libappindicator-status-server --task-name Server --ignore-return >> test-libappindicator-status
+ @chmod +x test-libappindicator-status
+
+TESTS += test-libappindicator-status
+
#########################################
## test-simple-app
#########################################
diff --git a/tests/test-libappindicator-status-client.c b/tests/test-libappindicator-status-client.c
new file mode 100644
index 0000000..55d85a2
--- /dev/null
+++ b/tests/test-libappindicator-status-client.c
@@ -0,0 +1,123 @@
+/*
+Tests for the libappindicator library that are over DBus. This is
+the client side of those tests.
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Ted Gould <ted@canonical.com>
+
+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
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranties of
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+PURPOSE. See the GNU General Public License for more details.
+
+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-lowlevel.h>
+#include "../src/dbus-shared.h"
+
+static GMainLoop * mainloop = NULL;
+static gboolean passed = TRUE;
+static gboolean watchdog_hit = TRUE;
+static gboolean active = FALSE;
+static guint toggle_count = 0;
+
+#define PASSIVE_STR "Passive"
+#define ACTIVE_STR "Active"
+#define ATTN_STR "NeedsAttention"
+
+static DBusHandlerResult
+dbus_filter (DBusConnection * connection, DBusMessage * message, void * user_data)
+{
+ 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;
+}
+
+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;
+}
+
+gint
+main (gint argc, gchar * argv[])
+{
+ g_type_init();
+
+ 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;
+ }
+
+ 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(250, 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;
+}
diff --git a/tests/test-libappindicator-status-server.c b/tests/test-libappindicator-status-server.c
new file mode 100644
index 0000000..9e58ba9
--- /dev/null
+++ b/tests/test-libappindicator-status-server.c
@@ -0,0 +1,76 @@
+/*
+Tests for the libappindicator library that are over DBus. This is
+the server side of those tests.
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+ Ted Gould <ted@canonical.com>
+
+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
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranties of
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+PURPOSE. See the GNU General Public License for more details.
+
+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 <stdlib.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
+#include <glib.h>
+#include <libappindicator/app-indicator.h>
+
+static GMainLoop * mainloop = NULL;
+static gboolean active = FALSE;
+static guint toggle_count = 0;
+
+gboolean
+toggle (gpointer userdata)
+{
+ if (active) {
+ app_indicator_set_status (APP_INDICATOR(userdata), APP_INDICATOR_STATUS_ATTENTION);
+ active = FALSE;
+ } else {
+ app_indicator_set_status (APP_INDICATOR(userdata), APP_INDICATOR_STATUS_ACTIVE);
+ active = TRUE;
+ }
+
+ toggle_count++;
+
+ if (toggle_count == 100) {
+ g_main_loop_quit(mainloop);
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+gint
+main (gint argc, gchar * argv[])
+{
+ g_type_init();
+
+ g_usleep(100000);
+
+ 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 ("my-id", "my-icon-name", APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
+ app_indicator_set_attention_icon (ci, "my-attention-icon");
+
+ g_timeout_add(50, toggle, ci);
+
+ mainloop = g_main_loop_new(NULL, FALSE);
+ g_main_loop_run(mainloop);
+
+ g_object_unref(G_OBJECT(ci));
+ g_debug("Quiting");
+
+ return 0;
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 03:40:29 +0000