aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am62
-rw-r--r--src/application-service-appstore.c1305
-rw-r--r--src/application-service-appstore.h73
-rw-r--r--src/application-service-watcher.c302
-rw-r--r--src/application-service-watcher.h61
-rw-r--r--src/application-service.c78
-rw-r--r--src/application-service.xml59
-rw-r--r--src/dbus-properties.xml23
-rw-r--r--src/indicator-application.c879
-rw-r--r--src/notification-approver.xml29
10 files changed, 6 insertions, 2865 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index e3d9184..073fc41 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,60 +22,12 @@ include $(top_srcdir)/Makefile.am.enum
include $(top_srcdir)/Makefile.am.marshal
##################################
-# Indicator
+# Marshallers
##################################
-applicationlibdir = $(INDICATORDIR)
-applicationlib_LTLIBRARIES = libapplication.la
-libapplication_la_SOURCES = \
- application-service-marshal.c \
- dbus-shared.h \
- indicator-application.c
-libapplication_la_CFLAGS = $(INDICATOR_CFLAGS) \
- -Wall \
- -Wl,-Bsymbolic-functions \
- -Wl,-z,defs \
- -Wl,--as-needed \
- -Werror \
- -DG_LOG_DOMAIN=\"Indicator-Application\"
-libapplication_la_LIBADD = $(INDICATOR_LIBS)
-libapplication_la_LDFLAGS = -module -avoid-version
-
-##################################
-# Service
-##################################
-
-libexec_PROGRAMS = indicator-application-service
-
BUILT_SOURCES += \
- application-service-server.h \
application-service-marshal.h \
- application-service-marshal.c \
- dbus-properties-client.h \
- notification-item-client.h \
- notification-watcher-server.h
-
-indicator_application_service_SOURCES = \
- application-service.c \
- application-service-appstore.h \
- application-service-appstore.c \
- application-service-marshal.c \
- application-service-watcher.h \
- application-service-watcher.c \
- app-indicator-enum-types.c \
- dbus-shared.h \
- generate-id.h \
- generate-id.c
-
-indicator_application_service_CFLAGS = \
- $(INDICATOR_CFLAGS) \
- -DDATADIR="\"$(pkgdatadir)\"" \
- -Wall -Werror \
- -DG_LOG_DOMAIN=\"indicator-application-service\"
-
-indicator_application_service_LDADD = \
- $(INDICATOR_LIBS) \
- libappindicator$(VER).la
+ application-service-marshal.c
glib_marshal_list = application-service-marshal.list
glib_marshal_prefix = _application_service_marshal
@@ -111,6 +63,7 @@ libappindicator_la_SOURCES = \
app-indicator-enum-types.c \
app-indicator.c \
application-service-marshal.c \
+ dbus-shared.h \
generate-id.h \
generate-id.c
@@ -120,12 +73,12 @@ libappindicator_la_LDFLAGS = \
-export-symbols-regex "^[^_d].*"
libappindicator_la_CFLAGS = \
- $(INDICATOR_CFLAGS) \
+ $(LIBRARY_CFLAGS) \
-Wall -Werror \
-DG_LOG_DOMAIN=\"libappindicator\"
libappindicator_la_LIBADD = \
- $(INDICATOR_LIBS)
+ $(LIBRARY_LIBS)
# We duplicate these here because Automake won't let us use $(VER) on the left hand side.
# Since we carefully use $(VER) in the right hand side above, we can assign the same values.
@@ -143,9 +96,6 @@ libappindicator3_la_LIBADD = $(libappindicator_la_LIBADD)
##################################
DBUS_SPECS = \
- dbus-properties.xml \
- application-service.xml \
- notification-approver.xml \
notification-item.xml \
notification-watcher.xml
@@ -202,7 +152,7 @@ AppIndicator$(VER)-0.1.gir: libappindicator$(VER).la
AppIndicator_0_1_gir_INCLUDES = \
GObject-2.0 \
$(GTKGIR)
-AppIndicator_0_1_gir_CFLAGS = $(INDICATOR_CFLAGS) -I$(srcdir) -I$(top_builddir)/src
+AppIndicator_0_1_gir_CFLAGS = $(LIBRARY_CFLAGS) -I$(srcdir) -I$(top_builddir)/src
AppIndicator_0_1_gir_LIBS = libappindicator$(VER).la
AppIndicator_0_1_gir_FILES = $(introspection_sources)
diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c
deleted file mode 100644
index e3befff..0000000
--- a/src/application-service-appstore.c
+++ /dev/null
@@ -1,1305 +0,0 @@
-/*
-An object that stores the registration of all the application
-indicators. It also communicates this to the indicator visualization.
-
-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/>.
-*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <dbus/dbus-glib.h>
-#include "app-indicator.h"
-#include "app-indicator-enum-types.h"
-#include "application-service-appstore.h"
-#include "application-service-marshal.h"
-#include "dbus-properties-client.h"
-#include "dbus-shared.h"
-#include "notification-approver-client.h"
-#include "generate-id.h"
-
-/* DBus Prototypes */
-static gboolean _application_service_server_get_applications (ApplicationServiceAppstore * appstore, GPtrArray ** apps, GError ** error);
-
-#include "application-service-server.h"
-
-#define NOTIFICATION_ITEM_PROP_ID "Id"
-#define NOTIFICATION_ITEM_PROP_CATEGORY "Category"
-#define NOTIFICATION_ITEM_PROP_STATUS "Status"
-#define NOTIFICATION_ITEM_PROP_ICON_NAME "IconName"
-#define NOTIFICATION_ITEM_PROP_AICON_NAME "AttentionIconName"
-#define NOTIFICATION_ITEM_PROP_ICON_THEME_PATH "IconThemePath"
-#define NOTIFICATION_ITEM_PROP_MENU "Menu"
-#define NOTIFICATION_ITEM_PROP_LABEL "XAyatanaLabel"
-#define NOTIFICATION_ITEM_PROP_LABEL_GUIDE "XAyatanaLabelGuide"
-#define NOTIFICATION_ITEM_PROP_ORDERING_INDEX "XAyatanaOrderingIndex"
-
-#define NOTIFICATION_ITEM_SIG_NEW_ICON "NewIcon"
-#define NOTIFICATION_ITEM_SIG_NEW_AICON "NewAttentionIcon"
-#define NOTIFICATION_ITEM_SIG_NEW_STATUS "NewStatus"
-#define NOTIFICATION_ITEM_SIG_NEW_LABEL "XAyatanaNewLabel"
-#define NOTIFICATION_ITEM_SIG_NEW_ICON_THEME_PATH "NewIconThemePath"
-
-#define OVERRIDE_GROUP_NAME "Ordering Index Overrides"
-#define OVERRIDE_FILE_NAME "ordering-override.keyfile"
-
-/* Private Stuff */
-struct _ApplicationServiceAppstorePrivate {
- DBusGConnection * bus;
- GList * applications;
- GList * approvers;
- GHashTable * ordering_overrides;
-};
-
-typedef enum {
- VISIBLE_STATE_HIDDEN,
- VISIBLE_STATE_SHOWN
-} visible_state_t;
-
-#define STATE2STRING(x) ((x) == VISIBLE_STATE_HIDDEN ? "hidden" : "visible")
-
-typedef struct _Approver Approver;
-struct _Approver {
- DBusGProxy * proxy;
- gboolean destroy_by_proxy;
-};
-
-typedef struct _Application Application;
-struct _Application {
- gchar * id;
- gchar * category;
- gchar * dbus_name;
- gchar * dbus_object;
- ApplicationServiceAppstore * appstore; /* not ref'd */
- DBusGProxy * dbus_proxy;
- DBusGProxy * prop_proxy;
- gboolean validated; /* Whether we've gotten all the parameters and they look good. */
- AppIndicatorStatus status;
- gchar * icon;
- gchar * aicon;
- gchar * menu;
- gchar * icon_theme_path;
- gchar * label;
- gchar * guide;
- gboolean currently_free;
- guint ordering_index;
- GList * approved_by;
- visible_state_t visible_state;
-};
-
-#define APPLICATION_SERVICE_APPSTORE_GET_PRIVATE(o) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((o), APPLICATION_SERVICE_APPSTORE_TYPE, ApplicationServiceAppstorePrivate))
-
-/* Signals Stuff */
-enum {
- APPLICATION_ADDED,
- APPLICATION_REMOVED,
- APPLICATION_ICON_CHANGED,
- APPLICATION_LABEL_CHANGED,
- APPLICATION_ICON_THEME_PATH_CHANGED,
- LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-/* GObject stuff */
-static void application_service_appstore_class_init (ApplicationServiceAppstoreClass *klass);
-static void application_service_appstore_init (ApplicationServiceAppstore *self);
-static void application_service_appstore_dispose (GObject *object);
-static void application_service_appstore_finalize (GObject *object);
-static gint app_sort_func (gconstpointer a, gconstpointer b, gpointer userdata);
-static void load_override_file (GHashTable * hash, const gchar * filename);
-static AppIndicatorStatus string_to_status(const gchar * status_string);
-static void apply_status (Application * app);
-static AppIndicatorCategory string_to_cat(const gchar * cat_string);
-static void approver_free (gpointer papprover, gpointer user_data);
-static void check_with_new_approver (gpointer papp, gpointer papprove);
-static void check_with_old_approver (gpointer papprove, gpointer papp);
-static Application * find_application (ApplicationServiceAppstore * appstore, const gchar * address, const gchar * object);
-
-G_DEFINE_TYPE (ApplicationServiceAppstore, application_service_appstore, G_TYPE_OBJECT);
-
-static void
-application_service_appstore_class_init (ApplicationServiceAppstoreClass *klass)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
- g_type_class_add_private (klass, sizeof (ApplicationServiceAppstorePrivate));
-
- object_class->dispose = application_service_appstore_dispose;
- object_class->finalize = application_service_appstore_finalize;
-
- signals[APPLICATION_ADDED] = g_signal_new ("application-added",
- G_TYPE_FROM_CLASS(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ApplicationServiceAppstoreClass, application_added),
- NULL, NULL,
- _application_service_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING,
- G_TYPE_NONE, 7, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_NONE);
- signals[APPLICATION_REMOVED] = g_signal_new ("application-removed",
- G_TYPE_FROM_CLASS(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ApplicationServiceAppstoreClass, application_removed),
- NULL, NULL,
- g_cclosure_marshal_VOID__INT,
- G_TYPE_NONE, 1, G_TYPE_INT, G_TYPE_NONE);
- signals[APPLICATION_ICON_CHANGED] = g_signal_new ("application-icon-changed",
- G_TYPE_FROM_CLASS(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ApplicationServiceAppstoreClass, application_icon_changed),
- NULL, NULL,
- _application_service_marshal_VOID__INT_STRING,
- G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_STRING, G_TYPE_NONE);
- signals[APPLICATION_ICON_THEME_PATH_CHANGED] = g_signal_new ("application-icon-theme-path-changed",
- G_TYPE_FROM_CLASS(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ApplicationServiceAppstoreClass, application_icon_theme_path_changed),
- NULL, NULL,
- _application_service_marshal_VOID__INT_STRING,
- G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_STRING, G_TYPE_NONE);
- signals[APPLICATION_LABEL_CHANGED] = g_signal_new ("application-label-changed",
- G_TYPE_FROM_CLASS(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ApplicationServiceAppstoreClass, application_label_changed),
- NULL, NULL,
- _application_service_marshal_VOID__INT_STRING_STRING,
- G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_NONE);
-
- dbus_g_object_register_marshaller(_application_service_marshal_VOID__STRING_STRING,
- G_TYPE_NONE,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_INVALID);
- dbus_g_object_register_marshaller(_application_service_marshal_VOID__BOOLEAN_STRING_OBJECT,
- G_TYPE_NONE,
- G_TYPE_BOOLEAN,
- G_TYPE_STRING,
- G_TYPE_OBJECT,
- G_TYPE_INVALID);
-
- dbus_g_object_type_install_info(APPLICATION_SERVICE_APPSTORE_TYPE,
- &dbus_glib__application_service_server_object_info);
-
- return;
-}
-
-static void
-application_service_appstore_init (ApplicationServiceAppstore *self)
-{
-
- ApplicationServiceAppstorePrivate * priv = APPLICATION_SERVICE_APPSTORE_GET_PRIVATE (self);
-
- priv->applications = NULL;
- priv->approvers = NULL;
-
- priv->ordering_overrides = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
-
- load_override_file(priv->ordering_overrides, DATADIR "/" OVERRIDE_FILE_NAME);
- gchar * userfile = g_build_filename(g_get_user_data_dir(), "indicators", "application", OVERRIDE_FILE_NAME, NULL);
- load_override_file(priv->ordering_overrides, userfile);
- g_free(userfile);
-
- GError * error = NULL;
- priv->bus = dbus_g_bus_get(DBUS_BUS_STARTER, &error);
- if (error != NULL) {
- g_error("Unable to get session bus: %s", error->message);
- g_error_free(error);
- return;
- }
-
- dbus_g_connection_register_g_object(priv->bus,
- INDICATOR_APPLICATION_DBUS_OBJ,
- G_OBJECT(self));
-
- self->priv = priv;
-
- return;
-}
-
-static void
-application_service_appstore_dispose (GObject *object)
-{
- ApplicationServiceAppstorePrivate * priv = APPLICATION_SERVICE_APPSTORE(object)->priv;
-
- while (priv->applications != NULL) {
- application_service_appstore_application_remove(APPLICATION_SERVICE_APPSTORE(object),
- ((Application *)priv->applications->data)->dbus_name,
- ((Application *)priv->applications->data)->dbus_object);
- }
-
- if (priv->approvers != NULL) {
- g_list_foreach(priv->approvers, approver_free, object);
- g_list_free(priv->approvers);
- priv->approvers = NULL;
- }
-
- G_OBJECT_CLASS (application_service_appstore_parent_class)->dispose (object);
- return;
-}
-
-static void
-application_service_appstore_finalize (GObject *object)
-{
- ApplicationServiceAppstorePrivate * priv = APPLICATION_SERVICE_APPSTORE(object)->priv;
-
- if (priv->ordering_overrides != NULL) {
- g_hash_table_destroy(priv->ordering_overrides);
- priv->ordering_overrides = NULL;
- }
-
- G_OBJECT_CLASS (application_service_appstore_parent_class)->finalize (object);
- return;
-}
-
-/* Loads the file and adds the override entries to the table
- of overrides */
-static void
-load_override_file (GHashTable * hash, const gchar * filename)
-{
- g_return_if_fail(hash != NULL);
- g_return_if_fail(filename != NULL);
-
- if (!g_file_test(filename, G_FILE_TEST_EXISTS)) {
- return;
- }
-
- g_debug("Loading overrides from: '%s'", filename);
-
- GError * error = NULL;
- GKeyFile * keyfile = g_key_file_new();
- g_key_file_load_from_file(keyfile, filename, G_KEY_FILE_NONE, &error);
-
- if (error != NULL) {
- g_warning("Unable to load keyfile '%s' because: %s", filename, error->message);
- g_error_free(error);
- g_key_file_free(keyfile);
- return;
- }
-
- gchar ** keys = g_key_file_get_keys(keyfile, OVERRIDE_GROUP_NAME, NULL, &error);
- if (error != NULL) {
- g_warning("Unable to get keys from keyfile '%s' because: %s", filename, error->message);
- g_error_free(error);
- g_key_file_free(keyfile);
- return;
- }
-
- gchar * key = keys[0];
- gint i;
-
- for (i = 0; (key = keys[i]) != NULL; i++) {
- GError * valerror = NULL;
- gint val = g_key_file_get_integer(keyfile, OVERRIDE_GROUP_NAME, key, &valerror);
-
- if (valerror != NULL) {
- g_warning("Unable to get key '%s' out of file '%s' because: %s", key, filename, valerror->message);
- g_error_free(valerror);
- continue;
- }
- g_debug("%s: override '%s' with value '%d'", filename, key, val);
-
- g_hash_table_insert(hash, g_strdup(key), GINT_TO_POINTER(val));
- }
- g_strfreev(keys);
- g_key_file_free(keyfile);
-
- return;
-}
-
-/* Return from getting the properties from the item. We're looking at those
- and making sure we have everythign that we need. If we do, then we'll
- move on up to sending this onto the indicator. */
-static void
-get_all_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError * error, gpointer data)
-{
- if (error != NULL) {
- g_warning("Unable to get properties: %s", error->message);
- /* TODO: We need to free all the application data here */
- return;
- }
-
- Application * app = (Application *)data;
-
- if (g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_MENU) == NULL ||
- g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ID) == NULL ||
- g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_CATEGORY) == NULL ||
- g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_STATUS) == NULL ||
- g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_NAME) == NULL) {
- g_warning("Notification Item on object %s of %s doesn't have enough properties.", app->dbus_object, app->dbus_name);
- g_free(app); // Need to do more than this, but it gives the idea of the flow we're going for.
- return;
- }
-
- app->validated = TRUE;
-
- app->id = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ID));
- app->category = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_CATEGORY));
- app->status = string_to_status(g_value_get_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_STATUS)));
-
- ApplicationServiceAppstorePrivate * priv = app->appstore->priv;
-
- app->icon = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_NAME));
-
- GValue * menuval = (GValue *)g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_MENU);
- if (G_VALUE_TYPE(menuval) == G_TYPE_STRING) {
- /* This is here to support an older version where we
- were using strings instea of object paths. */
- app->menu = g_value_dup_string(menuval);
- } else {
- app->menu = g_strdup((gchar *)g_value_get_boxed(menuval));
- }
-
- 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_AICON_NAME));
- }
-
- gpointer icon_theme_path_data = g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_THEME_PATH);
- if (icon_theme_path_data != NULL) {
- app->icon_theme_path = g_value_dup_string((GValue *)icon_theme_path_data);
- } else {
- app->icon_theme_path = g_strdup("");
- }
-
- gpointer ordering_index_over = g_hash_table_lookup(priv->ordering_overrides, app->id);
- if (ordering_index_over == NULL) {
- gpointer ordering_index_data = g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ORDERING_INDEX);
- if (ordering_index_data == NULL || g_value_get_uint(ordering_index_data) == 0) {
- app->ordering_index = generate_id(string_to_cat(app->category), app->id);
- } else {
- app->ordering_index = g_value_get_uint(ordering_index_data);
- }
- } else {
- app->ordering_index = GPOINTER_TO_UINT(ordering_index_over);
- }
- g_debug("'%s' ordering index is '%X'", app->id, app->ordering_index);
-
- gpointer label_data = g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_LABEL);
- if (label_data != NULL) {
- app->label = g_value_dup_string((GValue *)label_data);
- } else {
- app->label = g_strdup("");
- }
-
- gpointer guide_data = g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_LABEL_GUIDE);
- if (guide_data != NULL) {
- app->guide = g_value_dup_string((GValue *)guide_data);
- } else {
- app->guide = g_strdup("");
- }
-
- priv->applications = g_list_insert_sorted_with_data (priv->applications, app, app_sort_func, NULL);
- g_list_foreach(priv->approvers, check_with_old_approver, app);
-
- apply_status(app);
-
- return;
-}
-
-/* Check the application against an approver */
-static void
-check_with_old_approver (gpointer papprove, gpointer papp)
-{
- /* Funny the parallels, eh? */
- check_with_new_approver(papp, papprove);
- return;
-}
-
-/* Simple translation function -- could be optimized */
-static AppIndicatorStatus
-string_to_status(const gchar * status_string)
-{
- GEnumClass * klass = G_ENUM_CLASS(g_type_class_ref(APP_INDICATOR_TYPE_INDICATOR_STATUS));
- g_return_val_if_fail(klass != NULL, APP_INDICATOR_STATUS_PASSIVE);
-
- AppIndicatorStatus retval = APP_INDICATOR_STATUS_PASSIVE;
-
- GEnumValue * val = g_enum_get_value_by_nick(klass, status_string);
- if (val == NULL) {
- g_warning("Unrecognized status '%s' assuming passive.", status_string);
- } else {
- retval = (AppIndicatorStatus)val->value;
- }
-
- g_type_class_unref(klass);
-
- return retval;
-}
-
-/* Simple translation function -- could be optimized */
-static AppIndicatorCategory
-string_to_cat(const gchar * cat_string)
-{
- GEnumClass * klass = G_ENUM_CLASS(g_type_class_ref(APP_INDICATOR_TYPE_INDICATOR_CATEGORY));
- g_return_val_if_fail(klass != NULL, APP_INDICATOR_CATEGORY_OTHER);
-
- AppIndicatorCategory retval = APP_INDICATOR_CATEGORY_OTHER;
-
- GEnumValue * val = g_enum_get_value_by_nick(klass, cat_string);
- if (val == NULL) {
- g_warning("Unrecognized status '%s' assuming other.", cat_string);
- } else {
- retval = (AppIndicatorCategory)val->value;
- }
-
- g_type_class_unref(klass);
-
- return retval;
-}
-
-
-/* A small helper function to get the position of an application
- in the app list of the applications that are visible. */
-static gint
-get_position (Application * app) {
- ApplicationServiceAppstore * appstore = app->appstore;
- ApplicationServiceAppstorePrivate * priv = appstore->priv;
-
- GList * lapp;
- gint count;
-
- /* Go through the list and try to find ours */
- for (lapp = priv->applications, count = 0; lapp != NULL; lapp = g_list_next(lapp), count++) {
- if (lapp->data == app) {
- break;
- }
-
- /* If the selected app isn't visible let's not
- count it's position */
- Application * thisapp = (Application *)(lapp->data);
- if (thisapp->visible_state == VISIBLE_STATE_HIDDEN) {
- count--;
- }
- }
-
- if (lapp == NULL) {
- g_warning("Unable to find position for app '%s'", app->id);
- return -1;
- }
-
- return count;
-}
-
-/* A simple global function for dealing with freeing the information
- in an Application structure */
-static void
-application_free (Application * app)
-{
- if (app == NULL) return;
- g_debug("Application free '%s'", app->id);
-
- /* Handle the case where this could be called by unref'ing one of
- the proxy objects. */
- if (app->currently_free) return;
- app->currently_free = TRUE;
-
- if (app->dbus_proxy) {
- g_object_unref(app->dbus_proxy);
- }
- if (app->prop_proxy) {
- g_object_unref(app->prop_proxy);
- }
-
- if (app->id != NULL) {
- g_free(app->id);
- }
- if (app->category != NULL) {
- g_free(app->category);
- }
- if (app->dbus_name != NULL) {
- g_free(app->dbus_name);
- }
- if (app->dbus_object != NULL) {
- g_free(app->dbus_object);
- }
- if (app->icon != NULL) {
- g_free(app->icon);
- }
- if (app->aicon != NULL) {
- g_free(app->aicon);
- }
- if (app->menu != NULL) {
- g_free(app->menu);
- }
- if (app->icon_theme_path != NULL) {
- g_free(app->icon_theme_path);
- }
- if (app->label != NULL) {
- g_free(app->label);
- }
- if (app->guide != NULL) {
- g_free(app->guide);
- }
- if (app->approved_by != NULL) {
- g_list_free(app->approved_by);
- }
-
- g_free(app);
- return;
-}
-
-/* Gets called when the proxy is destroyed, which is usually when it
- drops off of the bus. */
-static void
-application_removed_cb (DBusGProxy * proxy, gpointer userdata)
-{
- Application * app = (Application *)userdata;
- g_debug("Application proxy destroyed '%s'", app->id);
-
- /* Remove from the panel */
- app->status = APP_INDICATOR_STATUS_PASSIVE;
- apply_status(app);
-
- /* Remove from the application list */
- app->appstore->priv->applications = g_list_remove(app->appstore->priv->applications, app);
-
- /* Destroy the data */
- application_free(app);
- return;
-}
-
-/* This function takes two Application structure
- pointers and uses their ordering index to compare them. */
-static gint
-app_sort_func (gconstpointer a, gconstpointer b, gpointer userdata)
-{
- Application * appa = (Application *)a;
- Application * appb = (Application *)b;
- return (appb->ordering_index/2) - (appa->ordering_index/2);
-}
-
-/* Change the status of the application. If we're going passive
- it removes it from the panel. If we're coming online, then
- it add it to the panel. Otherwise it changes the icon. */
-static void
-apply_status (Application * app)
-{
- ApplicationServiceAppstore * appstore = app->appstore;
- ApplicationServiceAppstorePrivate * priv = appstore->priv;
-
- /* g_debug("Applying status. Status: %d Approved by: %d Approvers: %d Visible: %d", app->status, g_list_length(app->approved_by), g_list_length(priv->approvers), app->visible_state); */
-
- visible_state_t goal_state = VISIBLE_STATE_HIDDEN;
-
- if (app->status != APP_INDICATOR_STATUS_PASSIVE &&
- g_list_length(app->approved_by) >= g_list_length(priv->approvers)) {
- goal_state = VISIBLE_STATE_SHOWN;
- }
-
- /* Nothing needs to change, we're good */
- if (app->visible_state == goal_state /* ) { */
- && goal_state == VISIBLE_STATE_HIDDEN) {
- /* TODO: Uhg, this is a little wrong in that we're going to
- send an icon every time the status changes and the indicator
- is visible even though it might not be updating. But, at
- this point we need a small patch that is harmless. In the
- future we need to track which icon is shown and remove the
- duplicate message. */
- return;
- }
-
- g_debug("Changing app '%s' state from %s to %s", app->id, STATE2STRING(app->visible_state), STATE2STRING(goal_state));
-
- /* This means we're going off line */
- if (goal_state == VISIBLE_STATE_HIDDEN) {
- gint position = get_position(app);
- if (position == -1) return;
-
- g_signal_emit(G_OBJECT(appstore),
- signals[APPLICATION_REMOVED], 0,
- position, TRUE);
- } else {
- /* Figure out which icon we should be using */
- gchar * newicon = app->icon;
- if (app->status == APP_INDICATOR_STATUS_ATTENTION && app->aicon != NULL && app->aicon[0] != '\0') {
- newicon = app->aicon;
- }
-
- /* Determine whether we're already shown or not */
- if (app->visible_state == VISIBLE_STATE_HIDDEN) {
- /* Put on panel */
- g_signal_emit(G_OBJECT(app->appstore),
- signals[APPLICATION_ADDED], 0,
- newicon,
- get_position(app), /* Position */
- app->dbus_name,
- app->menu,
- app->icon_theme_path,
- app->label,
- app->guide,
- TRUE);
- } else {
- /* Icon update */
- gint position = get_position(app);
- if (position == -1) return;
-
- g_signal_emit(G_OBJECT(appstore),
- signals[APPLICATION_ICON_CHANGED], 0,
- position, newicon, TRUE);
- }
- }
-
- app->visible_state = goal_state;
-
- return;
-}
-
-/* Gets the data back on an updated icon signal. Hopefully
- a new fun icon. */
-static void
-new_icon_cb (DBusGProxy * proxy, GValue value, GError * error, gpointer userdata)
-{
- /* Check for errors */
- if (error != NULL) {
- g_warning("Unable to get updated icon name: %s", error->message);
- return;
- }
-
- /* Grab the icon and make sure we have one */
- const gchar * newicon = g_value_get_string(&value);
- if (newicon == NULL) {
- g_warning("Bad new icon :(");
- return;
- }
-
- Application * app = (Application *) userdata;
-
- if (g_strcmp0(newicon, app->icon)) {
- /* If the new icon is actually a new icon */
- if (app->icon != NULL) g_free(app->icon);
- app->icon = g_strdup(newicon);
-
- if (app->visible_state == VISIBLE_STATE_SHOWN && app->status == APP_INDICATOR_STATUS_ACTIVE) {
- gint position = get_position(app);
- if (position == -1) return;
-
- g_signal_emit(G_OBJECT(app->appstore),
- signals[APPLICATION_ICON_CHANGED], 0,
- position, newicon, TRUE);
- }
- }
-
- return;
-}
-
-/* Gets the data back on an updated aicon signal. Hopefully
- a new fun icon. */
-static void
-new_aicon_cb (DBusGProxy * proxy, GValue value, GError * error, gpointer userdata)
-{
- /* Check for errors */
- if (error != NULL) {
- g_warning("Unable to get updated icon name: %s", error->message);
- return;
- }
-
- /* Grab the icon and make sure we have one */
- const gchar * newicon = g_value_get_string(&value);
- if (newicon == NULL) {
- g_warning("Bad new icon :(");
- return;
- }
-
- Application * app = (Application *) userdata;
-
- if (g_strcmp0(newicon, app->aicon)) {
- /* If the new icon is actually a new icon */
- if (app->aicon != NULL) g_free(app->aicon);
- app->aicon = g_strdup(newicon);
-
- if (app->visible_state == VISIBLE_STATE_SHOWN && app->status == APP_INDICATOR_STATUS_ATTENTION) {
- gint position = get_position(app);
- if (position == -1) return;
-
- g_signal_emit(G_OBJECT(app->appstore),
- signals[APPLICATION_ICON_CHANGED], 0,
- position, newicon, TRUE);
- }
- }
-
- return;
-}
-
-/* Called when the Notification Item signals that it
- has a new icon. */
-static void
-new_icon (DBusGProxy * proxy, gpointer data)
-{
- Application * app = (Application *)data;
- if (!app->validated) return;
-
- org_freedesktop_DBus_Properties_get_async(app->prop_proxy,
- NOTIFICATION_ITEM_DBUS_IFACE,
- NOTIFICATION_ITEM_PROP_ICON_NAME,
- new_icon_cb,
- app);
- return;
-}
-
-/* Called when the Notification Item signals that it
- has a new attention icon. */
-static void
-new_aicon (DBusGProxy * proxy, gpointer data)
-{
- Application * app = (Application *)data;
- if (!app->validated) return;
-
- org_freedesktop_DBus_Properties_get_async(app->prop_proxy,
- NOTIFICATION_ITEM_DBUS_IFACE,
- NOTIFICATION_ITEM_PROP_AICON_NAME,
- new_aicon_cb,
- app);
-
- return;
-}
-
-/* Called when the Notification Item signals that it
- has a new status. */
-static void
-new_status (DBusGProxy * proxy, const gchar * status, gpointer data)
-{
- Application * app = (Application *)data;
- if (!app->validated) return;
-
- app->status = string_to_status(status);
- apply_status(app);
-
- return;
-}
-
-/* Called when the Notification Item signals that it
- has a new icon theme path. */
-static void
-new_icon_theme_path (DBusGProxy * proxy, const gchar * icon_theme_path, gpointer data)
-{
- Application * app = (Application *)data;
- if (!app->validated) return;
-
- if (g_strcmp0(icon_theme_path, app->icon_theme_path)) {
- /* If the new icon theme path is actually a new icon theme path */
- if (app->icon_theme_path != NULL) g_free(app->icon_theme_path);
- app->icon_theme_path = g_strdup(icon_theme_path);
-
- if (app->visible_state != VISIBLE_STATE_HIDDEN) {
- gint position = get_position(app);
- if (position == -1) return;
-
- g_signal_emit(G_OBJECT(app->appstore),
- signals[APPLICATION_ICON_THEME_PATH_CHANGED], 0,
- position, app->icon_theme_path, TRUE);
- }
- }
-
- return;
-}
-
-/* Called when the Notification Item signals that it
- has a new label. */
-static void
-new_label (DBusGProxy * proxy, const gchar * label, const gchar * guide, gpointer data)
-{
- Application * app = (Application *)data;
- if (!app->validated) return;
-
- gboolean changed = FALSE;
-
- if (g_strcmp0(app->label, label) != 0) {
- changed = TRUE;
- if (app->label != NULL) {
- g_free(app->label);
- app->label = NULL;
- }
- app->label = g_strdup(label);
- }
-
- if (g_strcmp0(app->guide, guide) != 0) {
- changed = TRUE;
- if (app->guide != NULL) {
- g_free(app->guide);
- app->guide = NULL;
- }
- app->guide = g_strdup(guide);
- }
-
- if (changed) {
- gint position = get_position(app);
- if (position == -1) return;
-
- g_signal_emit(app->appstore, signals[APPLICATION_LABEL_CHANGED], 0,
- position,
- app->label != NULL ? app->label : "",
- app->guide != NULL ? app->guide : "",
- TRUE);
- }
-
- return;
-}
-
-/* Adding a new NotificationItem object from DBus in to the
- appstore. First, we need to get the information on it
- though. */
-void
-application_service_appstore_application_add (ApplicationServiceAppstore * appstore, const gchar * dbus_name, const gchar * dbus_object)
-{
- g_debug("Adding new application: %s:%s", dbus_name, dbus_object);
-
- /* Make sure we got a sensible request */
- g_return_if_fail(IS_APPLICATION_SERVICE_APPSTORE(appstore));
- g_return_if_fail(dbus_name != NULL && dbus_name[0] != '\0');
- g_return_if_fail(dbus_object != NULL && dbus_object[0] != '\0');
- ApplicationServiceAppstorePrivate * priv = appstore->priv;
- Application * app = find_application(appstore, dbus_name, dbus_object);
-
- if (app != NULL) {
- g_warning("Application already exists! Rerequesting properties.");
- org_freedesktop_DBus_Properties_get_all_async(app->prop_proxy,
- NOTIFICATION_ITEM_DBUS_IFACE,
- get_all_properties_cb,
- app);
- return;
- }
-
- /* Build the application entry. This will be carried
- along until we're sure we've got everything. */
- app = g_new0(Application, 1);
-
- app->validated = FALSE;
- app->dbus_name = g_strdup(dbus_name);
- app->dbus_object = g_strdup(dbus_object);
- app->appstore = appstore;
- app->status = APP_INDICATOR_STATUS_PASSIVE;
- app->icon = NULL;
- app->aicon = NULL;
- app->menu = NULL;
- app->icon_theme_path = NULL;
- app->label = NULL;
- app->guide = NULL;
- app->currently_free = FALSE;
- app->ordering_index = 0;
- app->approved_by = NULL;
- app->visible_state = VISIBLE_STATE_HIDDEN;
-
- /* Get the DBus proxy for the NotificationItem interface */
- GError * error = NULL;
- app->dbus_proxy = dbus_g_proxy_new_for_name_owner(priv->bus,
- app->dbus_name,
- app->dbus_object,
- NOTIFICATION_ITEM_DBUS_IFACE,
- &error);
-
- if (error != NULL) {
- g_warning("Unable to get notification item proxy for object '%s' on host '%s': %s", dbus_object, dbus_name, error->message);
- g_error_free(error);
- g_free(app);
- return;
- }
-
- /* We've got it, let's watch it for destruction */
- g_signal_connect(G_OBJECT(app->dbus_proxy), "destroy", G_CALLBACK(application_removed_cb), app);
-
- /* Grab the property proxy interface */
- app->prop_proxy = dbus_g_proxy_new_for_name_owner(priv->bus,
- app->dbus_name,
- app->dbus_object,
- DBUS_INTERFACE_PROPERTIES,
- &error);
-
- if (error != NULL) {
- g_warning("Unable to get property proxy for object '%s' on host '%s': %s", dbus_object, dbus_name, error->message);
- g_error_free(error);
- g_object_unref(app->dbus_proxy);
- g_free(app);
- return;
- }
-
- /* Connect to signals */
- dbus_g_proxy_add_signal(app->dbus_proxy,
- NOTIFICATION_ITEM_SIG_NEW_ICON,
- G_TYPE_INVALID);
- dbus_g_proxy_add_signal(app->dbus_proxy,
- NOTIFICATION_ITEM_SIG_NEW_AICON,
- G_TYPE_INVALID);
- dbus_g_proxy_add_signal(app->dbus_proxy,
- NOTIFICATION_ITEM_SIG_NEW_STATUS,
- G_TYPE_STRING,
- G_TYPE_INVALID);
- dbus_g_proxy_add_signal(app->dbus_proxy,
- NOTIFICATION_ITEM_SIG_NEW_ICON_THEME_PATH,
- G_TYPE_STRING,
- G_TYPE_INVALID);
- dbus_g_proxy_add_signal(app->dbus_proxy,
- NOTIFICATION_ITEM_SIG_NEW_LABEL,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_INVALID);
-
- dbus_g_proxy_connect_signal(app->dbus_proxy,
- NOTIFICATION_ITEM_SIG_NEW_ICON,
- G_CALLBACK(new_icon),
- app,
- NULL);
- dbus_g_proxy_connect_signal(app->dbus_proxy,
- NOTIFICATION_ITEM_SIG_NEW_AICON,
- G_CALLBACK(new_aicon),
- app,
- NULL);
- dbus_g_proxy_connect_signal(app->dbus_proxy,
- NOTIFICATION_ITEM_SIG_NEW_STATUS,
- G_CALLBACK(new_status),
- app,
- NULL);
- dbus_g_proxy_connect_signal(app->dbus_proxy,
- NOTIFICATION_ITEM_SIG_NEW_ICON_THEME_PATH,
- G_CALLBACK(new_icon_theme_path),
- app,
- NULL);
- dbus_g_proxy_connect_signal(app->dbus_proxy,
- NOTIFICATION_ITEM_SIG_NEW_LABEL,
- G_CALLBACK(new_label),
- app,
- NULL);
-
- /* Get all the propertiees */
- org_freedesktop_DBus_Properties_get_all_async(app->prop_proxy,
- NOTIFICATION_ITEM_DBUS_IFACE,
- get_all_properties_cb,
- app);
-
- /* We're returning, nothing is yet added until the properties
- come back and give us more info. */
- return;
-}
-
-/* Looks for an application in the list of applications */
-static Application *
-find_application (ApplicationServiceAppstore * appstore, const gchar * address, const gchar * object)
-{
- ApplicationServiceAppstorePrivate * priv = appstore->priv;
- GList * listpntr;
-
- for (listpntr = priv->applications; listpntr != NULL; listpntr = g_list_next(listpntr)) {
- Application * app = (Application *)listpntr->data;
-
- if (!g_strcmp0(app->dbus_name, address) && !g_strcmp0(app->dbus_object, object)) {
- return app;
- }
- }
-
- return NULL;
-}
-
-/* Removes an application. Currently only works for the apps
- that are shown. */
-void
-application_service_appstore_application_remove (ApplicationServiceAppstore * appstore, const gchar * dbus_name, const gchar * dbus_object)
-{
- g_return_if_fail(IS_APPLICATION_SERVICE_APPSTORE(appstore));
- g_return_if_fail(dbus_name != NULL && dbus_name[0] != '\0');
- g_return_if_fail(dbus_object != NULL && dbus_object[0] != '\0');
-
- Application * app = find_application(appstore, dbus_name, dbus_object);
- if (app != NULL) {
- application_removed_cb(NULL, app);
- } else {
- g_warning("Unable to find application %s:%s", dbus_name, dbus_object);
- }
-
- return;
-}
-
-gchar**
-application_service_appstore_application_get_list (ApplicationServiceAppstore * appstore)
-{
- ApplicationServiceAppstorePrivate * priv = appstore->priv;
- gchar ** out;
- gchar ** outpntr;
- GList * listpntr;
-
- out = g_new(gchar*, g_list_length(priv->applications) + 1);
-
- for (listpntr = priv->applications, outpntr = out; listpntr != NULL; listpntr = g_list_next(listpntr), ++outpntr) {
- Application * app = (Application *)listpntr->data;
- *outpntr = g_strdup_printf("%s%s", app->dbus_name, app->dbus_object);
- }
- *outpntr = 0;
- return out;
-}
-
-/* Creates a basic appstore object and attaches the
- LRU file object to it. */
-ApplicationServiceAppstore *
-application_service_appstore_new (void)
-{
- ApplicationServiceAppstore * appstore = APPLICATION_SERVICE_APPSTORE(g_object_new(APPLICATION_SERVICE_APPSTORE_TYPE, NULL));
- return appstore;
-}
-
-/* DBus Interface */
-static gboolean
-_application_service_server_get_applications (ApplicationServiceAppstore * appstore, GPtrArray ** apps, GError ** error)
-{
- ApplicationServiceAppstorePrivate * priv = appstore->priv;
-
- *apps = g_ptr_array_new();
- GList * listpntr;
- gint position = 0;
-
- for (listpntr = priv->applications; listpntr != NULL; listpntr = g_list_next(listpntr)) {
- Application * app = (Application *)listpntr->data;
- if (app->visible_state == VISIBLE_STATE_HIDDEN) {
- continue;
- }
-
- GValueArray * values = g_value_array_new(5);
-
- GValue value = {0};
-
- /* Icon name */
- g_value_init(&value, G_TYPE_STRING);
- g_value_set_string(&value, app->icon);
- g_value_array_append(values, &value);
- g_value_unset(&value);
-
- /* Position */
- g_value_init(&value, G_TYPE_INT);
- g_value_set_int(&value, position++);
- g_value_array_append(values, &value);
- g_value_unset(&value);
-
- /* DBus Address */
- g_value_init(&value, G_TYPE_STRING);
- g_value_set_string(&value, app->dbus_name);
- g_value_array_append(values, &value);
- g_value_unset(&value);
-
- /* DBus Object */
- g_value_init(&value, DBUS_TYPE_G_OBJECT_PATH);
- g_value_set_static_boxed(&value, app->menu);
- g_value_array_append(values, &value);
- g_value_unset(&value);
-
- /* Icon path */
- g_value_init(&value, G_TYPE_STRING);
- g_value_set_string(&value, app->icon_theme_path);
- g_value_array_append(values, &value);
- g_value_unset(&value);
-
- /* Label */
- g_value_init(&value, G_TYPE_STRING);
- g_value_set_string(&value, app->label);
- g_value_array_append(values, &value);
- g_value_unset(&value);
-
- /* Guide */
- g_value_init(&value, G_TYPE_STRING);
- g_value_set_string(&value, app->guide);
- g_value_array_append(values, &value);
- g_value_unset(&value);
-
- g_ptr_array_add(*apps, values);
- }
-
- return TRUE;
-}
-
-/* Removes and approver from our list of approvers and
- then sees if that changes our status. Most likely this
- could make us visible if this approver rejected us. */
-static void
-remove_approver (gpointer papp, gpointer pproxy)
-{
- Application * app = (Application *)papp;
- app->approved_by = g_list_remove(app->approved_by, pproxy);
- apply_status(app);
- return;
-}
-
-/* Frees the data associated with an approver */
-static void
-approver_free (gpointer papprover, gpointer user_data)
-{
- Approver * approver = (Approver *)papprover;
- g_return_if_fail(approver != NULL);
-
- ApplicationServiceAppstore * appstore = APPLICATION_SERVICE_APPSTORE(user_data);
- g_list_foreach(appstore->priv->applications, remove_approver, approver->proxy);
-
- if (approver->proxy != NULL) {
- if (!approver->destroy_by_proxy) {
- g_object_unref(approver->proxy);
- }
- approver->proxy = NULL;
- }
-
- g_free(approver);
- return;
-}
-
-/* What did the approver tell us? */
-static void
-approver_request_cb (DBusGProxy *proxy, gboolean OUT_approved, GError *error, gpointer userdata)
-{
- if (error == NULL) {
- g_debug("Approver responded: %s", OUT_approved ? "approve" : "rejected");
- } else {
- g_debug("Approver responded error: %s", error->message);
- }
-
- Application * app = (Application *)userdata;
-
- if (OUT_approved || error != NULL) {
- app->approved_by = g_list_prepend(app->approved_by, proxy);
- } else {
- app->approved_by = g_list_remove(app->approved_by, proxy);
- }
-
- apply_status(app);
- return;
-}
-
-/* Run the applications through the new approver */
-static void
-check_with_new_approver (gpointer papp, gpointer papprove)
-{
- Application * app = (Application *)papp;
- Approver * approver = (Approver *)papprove;
-
- org_ayatana_StatusNotifierApprover_approve_item_async(approver->proxy,
- app->id,
- app->category,
- 0,
- app->dbus_name,
- app->dbus_object,
- approver_request_cb,
- app);
-
- return;
-}
-
-/* Look through all the approvers and find the one with a given
- proxy. */
-static gint
-approver_find_by_proxy (gconstpointer papprover, gconstpointer pproxy)
-{
- Approver * approver = (Approver *)papprover;
-
- if (approver->proxy == pproxy) {
- return 0;
- }
-
- return -1;
-}
-
-/* Tracks when a proxy gets destroyed so that we know that the
- approver has dropped off the bus. */
-static void
-approver_destroyed (gpointer pproxy, gpointer pappstore)
-{
- ApplicationServiceAppstore * appstore = APPLICATION_SERVICE_APPSTORE(pappstore);
-
- GList * lapprover = g_list_find_custom(appstore->priv->approvers, pproxy, approver_find_by_proxy);
- if (lapprover == NULL) {
- g_warning("Approver proxy died, but we don't seem to have that approver.");
- return;
- }
-
- Approver * approver = (Approver *)lapprover->data;
- approver->destroy_by_proxy = TRUE;
-
- appstore->priv->approvers = g_list_remove(appstore->priv->approvers, approver);
- approver_free(approver, appstore);
-
- return;
-}
-
-/* A signal when an approver changes the why that it thinks about
- a particular indicator. */
-void
-approver_revise_judgement (DBusGProxy * proxy, gboolean new_status, gchar * address, DBusGProxy * get_path, gpointer user_data)
-{
- g_return_if_fail(IS_APPLICATION_SERVICE_APPSTORE(user_data));
- g_return_if_fail(address != NULL && address[0] != '\0');
- g_return_if_fail(get_path != NULL);
- const gchar * path = dbus_g_proxy_get_path(get_path);
- g_return_if_fail(path != NULL && path[0] != '\0');
-
- ApplicationServiceAppstore * appstore = APPLICATION_SERVICE_APPSTORE(user_data);
-
- Application * app = find_application(appstore, address, path);
-
- if (app == NULL) {
- g_warning("Unable to update approver status of application (%s:%s) as it was not found", address, path);
- return;
- }
-
- if (new_status) {
- app->approved_by = g_list_prepend(app->approved_by, proxy);
- } else {
- app->approved_by = g_list_remove(app->approved_by, proxy);
- }
- apply_status(app);
-
- return;
-}
-
-/* Adds a new approver to the app store */
-void
-application_service_appstore_approver_add (ApplicationServiceAppstore * appstore, const gchar * dbus_name, const gchar * dbus_object)
-{
- g_return_if_fail(IS_APPLICATION_SERVICE_APPSTORE(appstore));
- g_return_if_fail(dbus_name != NULL);
- g_return_if_fail(dbus_object != NULL);
- ApplicationServiceAppstorePrivate * priv = APPLICATION_SERVICE_APPSTORE_GET_PRIVATE (appstore);
-
- Approver * approver = g_new0(Approver, 1);
- approver->destroy_by_proxy = FALSE;
-
- GError * error = NULL;
- approver->proxy = dbus_g_proxy_new_for_name_owner(priv->bus,
- dbus_name,
- dbus_object,
- NOTIFICATION_APPROVER_DBUS_IFACE,
- &error);
- if (error != NULL) {
- g_warning("Unable to get approver interface on '%s:%s' : %s", dbus_name, dbus_object, error->message);
- g_error_free(error);
- g_free(approver);
- return;
- }
-
- g_signal_connect(G_OBJECT(approver->proxy), "destroy", G_CALLBACK(approver_destroyed), appstore);
-
- dbus_g_proxy_add_signal(approver->proxy,
- "ReviseJudgement",
- G_TYPE_BOOLEAN,
- G_TYPE_STRING,
- DBUS_TYPE_G_OBJECT_PATH,
- G_TYPE_INVALID);
- dbus_g_proxy_connect_signal(approver->proxy,
- "ReviseJudgement",
- G_CALLBACK(approver_revise_judgement),
- appstore,
- NULL);
-
- priv->approvers = g_list_prepend(priv->approvers, approver);
-
- g_list_foreach(priv->applications, check_with_new_approver, approver);
-
- return;
-}
-
diff --git a/src/application-service-appstore.h b/src/application-service-appstore.h
deleted file mode 100644
index aa2824b..0000000
--- a/src/application-service-appstore.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-An object that stores the registration of all the application
-indicators. It also communicates this to the indicator visualization.
-
-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/>.
-*/
-
-#ifndef __APPLICATION_SERVICE_APPSTORE_H__
-#define __APPLICATION_SERVICE_APPSTORE_H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define APPLICATION_SERVICE_APPSTORE_TYPE (application_service_appstore_get_type ())
-#define APPLICATION_SERVICE_APPSTORE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), APPLICATION_SERVICE_APPSTORE_TYPE, ApplicationServiceAppstore))
-#define APPLICATION_SERVICE_APPSTORE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), APPLICATION_SERVICE_APPSTORE_TYPE, ApplicationServiceAppstoreClass))
-#define IS_APPLICATION_SERVICE_APPSTORE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), APPLICATION_SERVICE_APPSTORE_TYPE))
-#define IS_APPLICATION_SERVICE_APPSTORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), APPLICATION_SERVICE_APPSTORE_TYPE))
-#define APPLICATION_SERVICE_APPSTORE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), APPLICATION_SERVICE_APPSTORE_TYPE, ApplicationServiceAppstoreClass))
-
-typedef struct _ApplicationServiceAppstore ApplicationServiceAppstore;
-typedef struct _ApplicationServiceAppstoreClass ApplicationServiceAppstoreClass;
-typedef struct _ApplicationServiceAppstorePrivate ApplicationServiceAppstorePrivate;
-
-struct _ApplicationServiceAppstoreClass {
- GObjectClass parent_class;
-
- void (*application_added) (ApplicationServiceAppstore * appstore, gchar *, gint, gchar *, gchar *, gpointer);
- void (*application_removed) (ApplicationServiceAppstore * appstore, gint, gpointer);
- void (*application_icon_changed)(ApplicationServiceAppstore * appstore, gint, const gchar *, gpointer);
- void (*application_icon_theme_path_changed)(ApplicationServiceAppstore * appstore, gint, const gchar *, gpointer);
- void (*application_label_changed)(ApplicationServiceAppstore * appstore, gint, const gchar *, const gchar *, gpointer);
-};
-
-struct _ApplicationServiceAppstore {
- GObject parent;
-
- ApplicationServiceAppstorePrivate * priv;
-};
-
-ApplicationServiceAppstore * application_service_appstore_new (void);
-GType application_service_appstore_get_type (void);
-void application_service_appstore_application_add (ApplicationServiceAppstore * appstore,
- const gchar * dbus_name,
- const gchar * dbus_object);
-void application_service_appstore_application_remove (ApplicationServiceAppstore * appstore,
- const gchar * dbus_name,
- const gchar * dbus_object);
-void application_service_appstore_approver_add (ApplicationServiceAppstore * appstore,
- const gchar * dbus_name,
- const gchar * dbus_object);
-gchar** application_service_appstore_application_get_list (ApplicationServiceAppstore * appstore);
-
-G_END_DECLS
-
-#endif
diff --git a/src/application-service-watcher.c b/src/application-service-watcher.c
deleted file mode 100644
index 50b0be9..0000000
--- a/src/application-service-watcher.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
-An object implementing the NotificationWatcher interface and passes
-the information into the app-store.
-
-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/>.
-*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <dbus/dbus-glib-bindings.h>
-#include "application-service-watcher.h"
-#include "dbus-shared.h"
-
-/* Enum for the properties so that they can be quickly
- found and looked up. */
-enum {
- PROP_0,
- PROP_PROTOCOL_VERSION,
- PROP_IS_STATUS_NOTIFIER_HOST_REGISTERED,
- PROP_REGISTERED_STATUS_NOTIFIER_ITEMS
-};
-
-/* The strings so that they can be slowly looked up. */
-#define PROP_PROTOCOL_VERSION_S "protocol-version"
-#define PROP_IS_STATUS_NOTIFIER_HOST_REGISTERED_S "is-status-notifier-host-registered"
-#define PROP_REGISTERED_STATUS_NOTIFIER_ITEMS_S "registered-status-notifier-items"
-
-#define CURRENT_PROTOCOL_VERSION 0
-
-static gboolean _notification_watcher_server_register_status_notifier_item (ApplicationServiceWatcher * appwatcher, const gchar * service, DBusGMethodInvocation * method);
-static gboolean _notification_watcher_server_register_status_notifier_host (ApplicationServiceWatcher * appwatcher, const gchar * host);
-static gboolean _notification_watcher_server_x_ayatana_register_notification_approver (ApplicationServiceWatcher * appwatcher, const gchar * path, const GArray * categories, DBusGMethodInvocation * method);
-static void get_name_cb (DBusGProxy * proxy, guint status, GError * error, gpointer data);
-
-#include "notification-watcher-server.h"
-
-/* Private Stuff */
-typedef struct _ApplicationServiceWatcherPrivate ApplicationServiceWatcherPrivate;
-struct _ApplicationServiceWatcherPrivate {
- ApplicationServiceAppstore * appstore;
- DBusGProxy * dbus_proxy;
-};
-
-#define APPLICATION_SERVICE_WATCHER_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), APPLICATION_SERVICE_WATCHER_TYPE, ApplicationServiceWatcherPrivate))
-
-/* Signals Stuff */
-enum {
- STATUS_NOTIFIER_ITEM_REGISTERED,
- STATUS_NOTIFIER_ITEM_UNREGISTERED,
- STATUS_NOTIFIER_HOST_REGISTERED,
- LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-/* GObject stuff */
-static void application_service_watcher_class_init (ApplicationServiceWatcherClass *klass);
-static void application_service_watcher_init (ApplicationServiceWatcher *self);
-static void application_service_watcher_dispose (GObject *object);
-static void application_service_watcher_finalize (GObject *object);
-static void application_service_watcher_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec);
-static void application_service_watcher_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec);
-
-G_DEFINE_TYPE (ApplicationServiceWatcher, application_service_watcher, G_TYPE_OBJECT);
-
-static void
-application_service_watcher_class_init (ApplicationServiceWatcherClass *klass)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
- g_type_class_add_private (klass, sizeof (ApplicationServiceWatcherPrivate));
-
- object_class->dispose = application_service_watcher_dispose;
- object_class->finalize = application_service_watcher_finalize;
-
- /* Property funcs */
- object_class->set_property = application_service_watcher_set_property;
- object_class->get_property = application_service_watcher_get_property;
-
- /* Properties */
- g_object_class_install_property (object_class,
- PROP_PROTOCOL_VERSION,
- g_param_spec_int(PROP_PROTOCOL_VERSION_S,
- "Protocol Version",
- "Which version of the StatusNotifierProtocol this watcher implements",
- 0, G_MAXINT,
- CURRENT_PROTOCOL_VERSION,
- G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
- g_object_class_install_property (object_class,
- PROP_IS_STATUS_NOTIFIER_HOST_REGISTERED,
- g_param_spec_boolean(PROP_IS_STATUS_NOTIFIER_HOST_REGISTERED_S,
- "Is StatusNotifierHost Registered",
- "True if there is at least one StatusNotifierHost registered",
- FALSE,
- G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
- g_object_class_install_property (object_class,
- PROP_REGISTERED_STATUS_NOTIFIER_ITEMS,
- g_param_spec_boxed(PROP_REGISTERED_STATUS_NOTIFIER_ITEMS_S,
- "Registered StatusNotifierItems",
- "The list of StatusNotifierItems registered to this watcher",
- G_TYPE_STRV,
- G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
- /* Signals */
- signals[STATUS_NOTIFIER_ITEM_REGISTERED] = g_signal_new ("status-notifier-item-registered",
- G_TYPE_FROM_CLASS(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ApplicationServiceWatcherClass, status_notifier_item_registered),
- NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
- G_TYPE_NONE, 1, G_TYPE_STRING, G_TYPE_NONE);
- signals[STATUS_NOTIFIER_ITEM_UNREGISTERED] = g_signal_new ("status-notifier-item-unregistered",
- G_TYPE_FROM_CLASS(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ApplicationServiceWatcherClass, status_notifier_item_unregistered),
- NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
- G_TYPE_NONE, 1, G_TYPE_STRING, G_TYPE_NONE);
- signals[STATUS_NOTIFIER_HOST_REGISTERED] = g_signal_new ("status-notifier-host-registered",
- G_TYPE_FROM_CLASS(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ApplicationServiceWatcherClass, status_notifier_host_registered),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0, G_TYPE_NONE);
-
- dbus_g_object_type_install_info(APPLICATION_SERVICE_WATCHER_TYPE,
- &dbus_glib__notification_watcher_server_object_info);
-
- return;
-}
-
-static void
-application_service_watcher_init (ApplicationServiceWatcher *self)
-{
- ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(self);
-
- priv->appstore = NULL;
-
- 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);
- g_error_free(error);
- return;
- }
-
- dbus_g_connection_register_g_object(session_bus,
- NOTIFICATION_WATCHER_DBUS_OBJ,
- G_OBJECT(self));
-
- priv->dbus_proxy = dbus_g_proxy_new_for_name_owner(session_bus,
- DBUS_SERVICE_DBUS,
- DBUS_PATH_DBUS,
- DBUS_INTERFACE_DBUS,
- &error);
- if (error != NULL) {
- g_error("Ah, can't get proxy to dbus: %s", error->message);
- g_error_free(error);
- return;
- }
-
- org_freedesktop_DBus_request_name_async(priv->dbus_proxy,
- NOTIFICATION_WATCHER_DBUS_ADDR,
- DBUS_NAME_FLAG_DO_NOT_QUEUE,
- get_name_cb,
- self);
-
- return;
-}
-
-static void
-application_service_watcher_dispose (GObject *object)
-{
- ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(object);
-
- if (priv->appstore != NULL) {
- g_object_unref(G_OBJECT(priv->appstore));
- priv->appstore = NULL;
- }
-
- G_OBJECT_CLASS (application_service_watcher_parent_class)->dispose (object);
- return;
-}
-
-static void
-application_service_watcher_finalize (GObject *object)
-{
-
- G_OBJECT_CLASS (application_service_watcher_parent_class)->finalize (object);
- return;
-}
-
-static void
-application_service_watcher_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec)
-{
- /* There are no writable properties for now */
-}
-
-static void
-application_service_watcher_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec)
-{
- ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(object);
- switch (prop_id) {
- case PROP_PROTOCOL_VERSION:
- g_value_set_int (value, CURRENT_PROTOCOL_VERSION);
- break;
- case PROP_IS_STATUS_NOTIFIER_HOST_REGISTERED:
- g_value_set_boolean (value, TRUE);
- break;
- case PROP_REGISTERED_STATUS_NOTIFIER_ITEMS:
- g_value_set_boxed (value, application_service_appstore_application_get_list(priv->appstore));
- break;
- }
-}
-
-ApplicationServiceWatcher *
-application_service_watcher_new (ApplicationServiceAppstore * appstore)
-{
- GObject * obj = g_object_new(APPLICATION_SERVICE_WATCHER_TYPE, NULL);
- ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(obj);
- priv->appstore = appstore;
- g_object_ref(G_OBJECT(priv->appstore));
- return APPLICATION_SERVICE_WATCHER(obj);
-}
-
-static gboolean
-_notification_watcher_server_register_status_notifier_item (ApplicationServiceWatcher * appwatcher, const gchar * service, DBusGMethodInvocation * method)
-{
- ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(appwatcher);
-
- if (service[0] == '/') {
- application_service_appstore_application_add(priv->appstore,
- dbus_g_method_get_sender(method),
- service);
- } else {
- application_service_appstore_application_add(priv->appstore,
- service,
- NOTIFICATION_ITEM_DEFAULT_OBJ);
- }
-
- dbus_g_method_return(method, G_TYPE_NONE);
- return TRUE;
-}
-
-static gboolean
-_notification_watcher_server_register_status_notifier_host (ApplicationServiceWatcher * appwatcher, const gchar * host)
-{
-
- return FALSE;
-}
-
-/* Function to handle the return of the get name. There isn't a whole
- lot that can be done, but we're atleast going to tell people. */
-static void
-get_name_cb (DBusGProxy * proxy, guint status, GError * error, gpointer data)
-{
- if (error != NULL) {
- g_warning("Unable to get watcher name '%s' because: %s", NOTIFICATION_WATCHER_DBUS_ADDR, error->message);
- return;
- }
-
- if (status != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER &&
- status != DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER) {
- g_warning("Unable to get watcher name '%s'", NOTIFICATION_WATCHER_DBUS_ADDR);
- return;
- }
-
- return;
-}
-
-static gboolean
-_notification_watcher_server_x_ayatana_register_notification_approver (ApplicationServiceWatcher * appwatcher, const gchar * path, const GArray * categories, DBusGMethodInvocation * method)
-{
- ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(appwatcher);
-
- application_service_appstore_approver_add(priv->appstore,
- dbus_g_method_get_sender(method),
- path);
-
- dbus_g_method_return(method, G_TYPE_NONE);
- return TRUE;
-}
diff --git a/src/application-service-watcher.h b/src/application-service-watcher.h
deleted file mode 100644
index 6c430db..0000000
--- a/src/application-service-watcher.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-An object implementing the NotificationWatcher interface and passes
-the information into the app-store.
-
-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/>.
-*/
-
-#ifndef __APPLICATION_SERVICE_WATCHER_H__
-#define __APPLICATION_SERVICE_WATCHER_H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include "application-service-appstore.h"
-
-G_BEGIN_DECLS
-
-#define APPLICATION_SERVICE_WATCHER_TYPE (application_service_watcher_get_type ())
-#define APPLICATION_SERVICE_WATCHER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), APPLICATION_SERVICE_WATCHER_TYPE, ApplicationServiceWatcher))
-#define APPLICATION_SERVICE_WATCHER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), APPLICATION_SERVICE_WATCHER_TYPE, ApplicationServiceWatcherClass))
-#define IS_APPLICATION_SERVICE_WATCHER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), APPLICATION_SERVICE_WATCHER_TYPE))
-#define IS_APPLICATION_SERVICE_WATCHER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), APPLICATION_SERVICE_WATCHER_TYPE))
-#define APPLICATION_SERVICE_WATCHER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), APPLICATION_SERVICE_WATCHER_TYPE, ApplicationServiceWatcherClass))
-
-typedef struct _ApplicationServiceWatcher ApplicationServiceWatcher;
-typedef struct _ApplicationServiceWatcherClass ApplicationServiceWatcherClass;
-
-struct _ApplicationServiceWatcherClass {
- GObjectClass parent_class;
-
- /* Signals */
- void (*status_notifier_item_registered) (ApplicationServiceWatcher * watcher, gchar * object, gpointer data);
- void (*status_notifier_item_unregistered) (ApplicationServiceWatcher * watcher, gchar * object, gpointer data);
- void (*status_notifier_host_registered) (ApplicationServiceWatcher * watcher, gpointer data);
-};
-
-struct _ApplicationServiceWatcher {
- GObject parent;
-};
-
-GType application_service_watcher_get_type (void);
-ApplicationServiceWatcher * application_service_watcher_new (ApplicationServiceAppstore * appstore);
-
-G_END_DECLS
-
-#endif
diff --git a/src/application-service.c b/src/application-service.c
deleted file mode 100644
index 94e7d2e..0000000
--- a/src/application-service.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-The core file for the service that starts up all the objects we need
-and houses our main loop.
-
-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 "libindicator/indicator-service.h"
-#include "notification-item-client.h"
-#include "application-service-appstore.h"
-#include "application-service-watcher.h"
-#include "dbus-shared.h"
-
-/* The base main loop */
-static GMainLoop * mainloop = NULL;
-/* Where the application registry lives */
-static ApplicationServiceAppstore * appstore = NULL;
-/* Interface for applications */
-static ApplicationServiceWatcher * watcher = NULL;
-/* The service management interface */
-static IndicatorService * service = NULL;
-
-/* Recieves the disonnection signal from the service
- object and closes the mainloop. */
-static void
-service_disconnected (IndicatorService * service, gpointer data)
-{
- g_debug("Service disconnected");
- if (mainloop != NULL) {
- g_main_loop_quit(mainloop);
- }
- return;
-}
-
-/* Builds up the core objects and puts us spinning into
- a main loop. */
-int
-main (int argc, char ** argv)
-{
- g_type_init();
-
- /* Bring us up as a basic indicator service */
- service = indicator_service_new(INDICATOR_APPLICATION_DBUS_ADDR);
- g_signal_connect(G_OBJECT(service), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, G_CALLBACK(service_disconnected), NULL);
-
- /* Building our app store */
- appstore = application_service_appstore_new();
-
- /* Adding a watcher for the Apps coming up */
- watcher = application_service_watcher_new(appstore);
-
- /* Building and executing our main loop */
- mainloop = g_main_loop_new(NULL, FALSE);
- g_main_loop_run(mainloop);
-
- /* Unref'ing all the objects */
- g_object_unref(G_OBJECT(watcher));
- g_object_unref(G_OBJECT(appstore));
- g_object_unref(G_OBJECT(service));
-
- return 0;
-}
diff --git a/src/application-service.xml b/src/application-service.xml
deleted file mode 100644
index 031bf68..0000000
--- a/src/application-service.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-An interface for communication between the service and indicator.
-
-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/>.
--->
-<node name="/">
- <interface name="org.ayatana.indicator.application.service">
-<!-- Properties -->
- <!-- None currently -->
-
-<!-- Methods -->
- <method name="GetApplications">
- <arg type="a(sisosss)" name="applications" direction="out" />
- </method>
-
-<!-- Signals -->
- <signal name="ApplicationAdded">
- <arg type="s" name="iconname" direction="out" />
- <arg type="i" name="position" direction="out" />
- <arg type="s" name="dbusaddress" direction="out" />
- <arg type="o" name="dbusobject" direction="out" />
- <arg type="s" name="iconpath" direction="out" />
- <arg type="s" name="label" direction="out" />
- <arg type="s" name="labelguide" direction="out" />
- </signal>
- <signal name="ApplicationRemoved">
- <arg type="i" name="position" direction="out" />
- </signal>
- <signal name="ApplicationIconChanged">
- <arg type="i" name="position" direction="out" />
- <arg type="s" name="icon_name" direction="out" />
- </signal>
- <signal name="ApplicationIconThemePathChanged">
- <arg type="i" name="position" direction="out" />
- <arg type="s" name="icon_theme_path" direction="out" />
- </signal>
- <signal name="ApplicationLabelChanged">
- <arg type="i" name="position" direction="out" />
- <arg type="s" name="label" direction="out" />
- <arg type="s" name="guide" direction="out" />
- </signal>
- </interface>
-</node>
diff --git a/src/dbus-properties.xml b/src/dbus-properties.xml
deleted file mode 100644
index c172895..0000000
--- a/src/dbus-properties.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<node name="/">
- <interface name="org.freedesktop.DBus.Properties">
-
- <method name="Get">
- <arg direction="in" type="s" name="Interface_Name"/>
- <arg direction="in" type="s" name="Property_Name"/>
- <arg direction="out" type="v" name="Value"/>
- </method>
-
- <method name="Set">
- <arg direction="in" type="s" name="Interface_Name"/>
- <arg direction="in" type="s" name="Property_Name"/>
- <arg direction="in" type="v" name="Value"/>
- </method>
-
- <method name="GetAll">
- <arg direction="in" type="s" name="Interface_Name"/>
- <arg direction="out" type="a{sv}" name="Properties"/>
- </method>
-
- </interface>
-</node>
diff --git a/src/indicator-application.c b/src/indicator-application.c
deleted file mode 100644
index ecf19e8..0000000
--- a/src/indicator-application.c
+++ /dev/null
@@ -1,879 +0,0 @@
-/*
-The indicator application visualization object. It takes the information
-given by the service and turns it into real-world pixels that users can
-actually use. Well, GTK does that, but this asks nicely.
-
-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/>.
-*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-/* G Stuff */
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-/* DBus Stuff */
-#include <dbus/dbus-glib.h>
-#ifdef HAVE_GTK3
-#include <libdbusmenu-gtk3/menu.h>
-#else
-#include <libdbusmenu-gtk/menu.h>
-#endif
-
-/* Indicator Stuff */
-#include <libindicator/indicator.h>
-#include <libindicator/indicator-object.h>
-#include <libindicator/indicator-service-manager.h>
-#include <libindicator/indicator-image-helper.h>
-
-/* Local Stuff */
-#include "dbus-shared.h"
-#include "application-service-client.h"
-#include "application-service-marshal.h"
-
-#define PANEL_ICON_SUFFIX "panel"
-
-#define INDICATOR_APPLICATION_TYPE (indicator_application_get_type ())
-#define INDICATOR_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_APPLICATION_TYPE, IndicatorApplication))
-#define INDICATOR_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_APPLICATION_TYPE, IndicatorApplicationClass))
-#define IS_INDICATOR_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_APPLICATION_TYPE))
-#define IS_INDICATOR_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_APPLICATION_TYPE))
-#define INDICATOR_APPLICATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_APPLICATION_TYPE, IndicatorApplicationClass))
-
-typedef struct _IndicatorApplication IndicatorApplication;
-typedef struct _IndicatorApplicationClass IndicatorApplicationClass;
-
-struct _IndicatorApplicationClass {
- IndicatorObjectClass parent_class;
-};
-
-struct _IndicatorApplication {
- IndicatorObject parent;
-};
-
-GType indicator_application_get_type (void);
-
-INDICATOR_SET_VERSION
-INDICATOR_SET_TYPE(INDICATOR_APPLICATION_TYPE)
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-typedef struct _IndicatorApplicationPrivate IndicatorApplicationPrivate;
-struct _IndicatorApplicationPrivate {
- IndicatorServiceManager * sm;
- DBusGConnection * bus;
- DBusGProxy * service_proxy;
- GList * applications;
- GHashTable * theme_dirs;
- guint disconnect_kill;
-};
-
-typedef struct _ApplicationEntry ApplicationEntry;
-struct _ApplicationEntry {
- IndicatorObjectEntry entry;
- gchar * icon_theme_path;
- gboolean old_service;
- gchar * dbusobject;
- gchar * dbusaddress;
- gchar * guide;
- gchar * longname;
-};
-
-#define INDICATOR_APPLICATION_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), INDICATOR_APPLICATION_TYPE, IndicatorApplicationPrivate))
-
-static void indicator_application_class_init (IndicatorApplicationClass *klass);
-static void indicator_application_init (IndicatorApplication *self);
-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);
-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_theme_path, const gchar * label, const gchar * guide, IndicatorApplication * application);
-static void application_removed (DBusGProxy * proxy, gint position , IndicatorApplication * application);
-static void application_label_changed (DBusGProxy * proxy, gint position, const gchar * label, const gchar * guide, IndicatorApplication * application);
-static void application_icon_changed (DBusGProxy * proxy, gint position, const gchar * iconname, IndicatorApplication * application);
-static void application_icon_theme_path_changed (DBusGProxy * proxy, gint position, const gchar * icon_theme_path, IndicatorApplication * application);
-static void get_applications (DBusGProxy *proxy, GPtrArray *OUT_applications, GError *error, gpointer userdata);
-static void get_applications_helper (gpointer data, gpointer user_data);
-static void theme_dir_unref(IndicatorApplication * ia, const gchar * dir);
-static void theme_dir_ref(IndicatorApplication * ia, const gchar * dir);
-
-G_DEFINE_TYPE (IndicatorApplication, indicator_application, INDICATOR_OBJECT_TYPE);
-
-static void
-indicator_application_class_init (IndicatorApplicationClass *klass)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
- g_type_class_add_private (klass, sizeof (IndicatorApplicationPrivate));
-
- object_class->dispose = indicator_application_dispose;
- object_class->finalize = indicator_application_finalize;
-
- IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass);
-
- io_class->get_entries = get_entries;
- io_class->get_location = get_location;
-
- dbus_g_object_register_marshaller(_application_service_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING,
- G_TYPE_NONE,
- G_TYPE_STRING,
- G_TYPE_INT,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_INVALID);
- dbus_g_object_register_marshaller(_application_service_marshal_VOID__INT_STRING,
- G_TYPE_NONE,
- G_TYPE_INT,
- G_TYPE_STRING,
- G_TYPE_INVALID);
- dbus_g_object_register_marshaller(_application_service_marshal_VOID__INT_STRING_STRING,
- G_TYPE_NONE,
- G_TYPE_INT,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_INVALID);
-
- return;
-}
-
-static void
-indicator_application_init (IndicatorApplication *self)
-{
- IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(self);
-
- /* These are built in the connection phase */
- 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(connection_changed), self);
-
- priv->applications = NULL;
-
- priv->theme_dirs = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
-
- return;
-}
-
-static void
-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,
- INDICATOR_APPLICATION(object));
- }
-
- if (priv->sm != NULL) {
- g_object_unref(priv->sm);
- priv->sm = NULL;
- }
-
- if (priv->bus != NULL) {
- /* We're not incrementing the ref count on this one. */
- priv->bus = NULL;
- }
-
- if (priv->service_proxy != NULL) {
- g_object_unref(G_OBJECT(priv->service_proxy));
- priv->service_proxy = NULL;
- }
-
- if (priv->theme_dirs != NULL) {
- while (g_hash_table_size(priv->theme_dirs)) {
- GList * keys = g_hash_table_get_keys(priv->theme_dirs);
- theme_dir_unref(INDICATOR_APPLICATION(object), (gchar *)keys->data);
- }
- g_hash_table_destroy(priv->theme_dirs);
- priv->theme_dirs = NULL;
- }
-
- G_OBJECT_CLASS (indicator_application_parent_class)->dispose (object);
- return;
-}
-
-static void
-indicator_application_finalize (GObject *object)
-{
-
- G_OBJECT_CLASS (indicator_application_parent_class)->finalize (object);
- return;
-}
-
-/* Responds to connection change event from the service manager and
- splits it into two. */
-void
-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.");
-
- GError * error = NULL;
-
- /* Grab the session bus */
- if (priv->bus == NULL) {
- priv->bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-
- if (error != NULL) {
- g_error("Unable to get session bus: %s", error->message);
- g_error_free(error);
- return;
- }
- }
-
- if (priv->service_proxy == NULL) {
- /* Build the service proxy */
- 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_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);
- dbus_g_proxy_add_signal(priv->service_proxy,
- "ApplicationIconThemePathChanged",
- G_TYPE_INT,
- G_TYPE_STRING,
- G_TYPE_INVALID);
- dbus_g_proxy_add_signal(priv->service_proxy,
- "ApplicationLabelChanged",
- G_TYPE_INT,
- G_TYPE_STRING,
- 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 */);
- dbus_g_proxy_connect_signal(priv->service_proxy,
- "ApplicationIconThemePathChanged",
- G_CALLBACK(application_icon_theme_path_changed),
- application,
- NULL /* Disconnection Signal */);
- dbus_g_proxy_connect_signal(priv->service_proxy,
- "ApplicationLabelChanged",
- G_CALLBACK(application_label_changed),
- application,
- NULL /* Disconnection Signal */);
- }
-
- /* Query it for existing applications */
- g_debug("Request current apps");
- org_ayatana_indicator_application_service_get_applications_async(priv->service_proxy,
- get_applications,
- application);
-
- 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. */
-static GList *
-get_entries (IndicatorObject * io)
-{
- g_return_val_if_fail(IS_INDICATOR_APPLICATION(io), NULL);
-
- IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(io);
- GList * retval = NULL;
- GList * apppointer = NULL;
-
- for (apppointer = priv->applications; apppointer != NULL; apppointer = g_list_next(apppointer)) {
- IndicatorObjectEntry * entry = &(((ApplicationEntry *)apppointer->data)->entry);
- retval = g_list_prepend(retval, entry);
- }
-
- if (retval != NULL) {
- retval = g_list_reverse(retval);
- }
-
- return retval;
-}
-
-/* Finds the location of a specific entry */
-static guint
-get_location (IndicatorObject * io, IndicatorObjectEntry * entry)
-{
- g_return_val_if_fail(IS_INDICATOR_APPLICATION(io), 0);
- IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(io);
- 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;
-}
-
-/* Does a quick meausre of how big the string is in
- pixels with a Pango layout */
-static gint
-measure_string (GtkStyle * style, PangoContext * context, const gchar * string)
-{
- PangoLayout * layout = pango_layout_new(context);
- pango_layout_set_text(layout, string, -1);
- pango_layout_set_font_description(layout, style->font_desc);
-
- gint width;
- pango_layout_get_pixel_size(layout, &width, NULL);
- g_object_unref(layout);
- return width;
-}
-
-/* Try to get a good guess at what a maximum width of the entire
- string would be. */
-static void
-guess_label_size (ApplicationEntry * app)
-{
- /* This is during startup. */
- if (app->entry.label == NULL) return;
-
- GtkStyle * style = gtk_widget_get_style(GTK_WIDGET(app->entry.label));
- PangoContext * context = gtk_widget_get_pango_context(GTK_WIDGET(app->entry.label));
-
- gint length = measure_string(style, context, gtk_label_get_text(app->entry.label));
-
- if (app->guide != NULL) {
- gint guidelen = measure_string(style, context, app->guide);
- if (guidelen > length) {
- length = guidelen;
- }
- }
-
- gtk_widget_set_size_request(GTK_WIDGET(app->entry.label), length, -1);
-
- return;
-}
-
-/* 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_theme_path, const gchar * label, const gchar * guide, 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_theme_path = NULL;
- if (icon_theme_path != NULL && icon_theme_path[0] != '\0') {
- app->icon_theme_path = g_strdup(icon_theme_path);
- theme_dir_ref(application, icon_theme_path);
- }
-
- app->dbusaddress = g_strdup(dbusaddress);
- app->dbusobject = g_strdup(dbusobject);
- app->guide = NULL;
-
- /* 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. */
- app->longname = NULL;
- if (!g_str_has_suffix(iconname, PANEL_ICON_SUFFIX)) {
- app->longname = g_strdup_printf("%s-%s", iconname, PANEL_ICON_SUFFIX);
- } else {
- app->longname = g_strdup(iconname);
- }
- app->entry.image = indicator_image_helper(app->longname);
-
- if (label == NULL || label[0] == '\0') {
- app->entry.label = NULL;
- } else {
- app->entry.label = GTK_LABEL(gtk_label_new(label));
- g_object_ref(G_OBJECT(app->entry.label));
- gtk_widget_show(GTK_WIDGET(app->entry.label));
-
- if (app->guide != NULL) {
- g_free(app->guide);
- app->guide = NULL;
- }
-
- if (guide != NULL) {
- app->guide = g_strdup(guide);
- }
-
- guess_label_size(app);
- }
-
- app->entry.menu = GTK_MENU(dbusmenu_gtkmenu_new((gchar *)dbusaddress, (gchar *)dbusobject));
-
- /* Keep copies of these for ourself, just in case. */
- g_object_ref(app->entry.image);
- g_object_ref(app->entry.menu);
-
- gtk_widget_show(GTK_WIDGET(app->entry.image));
-
- priv->applications = g_list_insert(priv->applications, app, position);
-
- g_signal_emit(G_OBJECT(application), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED_ID, 0, &(app->entry), TRUE);
- return;
-}
-
-/* This removes the application from the list and free's all
- of the memory associated with it. */
-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);
-
- if (app == NULL) {
- g_warning("Unable to find application at position: %d", position);
- return;
- }
-
- priv->applications = g_list_remove(priv->applications, app);
- g_signal_emit(G_OBJECT(application), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID, 0, &(app->entry), TRUE);
-
- if (app->icon_theme_path != NULL) {
- theme_dir_unref(application, app->icon_theme_path);
- g_free(app->icon_theme_path);
- }
- if (app->dbusaddress != NULL) {
- g_free(app->dbusaddress);
- }
- if (app->dbusobject != NULL) {
- g_free(app->dbusobject);
- }
- if (app->guide != NULL) {
- g_free(app->guide);
- }
- if (app->longname != NULL) {
- g_free(app->longname);
- }
- if (app->entry.image != NULL) {
- g_object_unref(G_OBJECT(app->entry.image));
- }
- if (app->entry.label != NULL) {
- g_object_unref(G_OBJECT(app->entry.label));
- }
- if (app->entry.menu != NULL) {
- g_object_unref(G_OBJECT(app->entry.menu));
- }
- g_free(app);
-
- return;
-}
-
-/* The callback for the signal that the label for an application
- has changed. */
-static void
-application_label_changed (DBusGProxy * proxy, gint position, const gchar * label, const gchar * guide, IndicatorApplication * application)
-{
- IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application);
- ApplicationEntry * app = (ApplicationEntry *)g_list_nth_data(priv->applications, position);
- gboolean signal_reload = FALSE;
-
- if (app == NULL) {
- g_warning("Unable to find application at position: %d", position);
- return;
- }
-
- if (label == NULL || label[0] == '\0') {
- /* No label, let's see if we need to delete the old one */
- if (app->entry.label != NULL) {
- g_object_unref(G_OBJECT(app->entry.label));
- app->entry.label = NULL;
-
- signal_reload = TRUE;
- }
- } else {
- /* We've got a label, is this just an update or is
- it a new thing. */
- if (app->entry.label != NULL) {
- gtk_label_set_text(app->entry.label, label);
- } else {
- app->entry.label = GTK_LABEL(gtk_label_new(label));
- g_object_ref(G_OBJECT(app->entry.label));
- gtk_widget_show(GTK_WIDGET(app->entry.label));
-
- signal_reload = TRUE;
- }
- }
-
- /* Copy the guide if we have one */
- if (app->guide != NULL) {
- g_free(app->guide);
- app->guide = NULL;
- }
-
- if (guide != NULL && guide[0] != '\0') {
- app->guide = g_strdup(guide);
- }
-
- /* Protected against not having a label */
- guess_label_size(app);
-
- if (signal_reload) {
- /* Telling the listener that this has been removed, and then
- readded to make it reparse the entry. */
- if (app->entry.label != NULL) {
- gtk_widget_hide(GTK_WIDGET(app->entry.label));
- }
-
- if (app->entry.image != NULL) {
- gtk_widget_hide(GTK_WIDGET(app->entry.image));
- }
-
- if (app->entry.menu != NULL) {
- gtk_menu_detach(app->entry.menu);
- }
-
- g_signal_emit(G_OBJECT(application), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID, 0, &(app->entry), TRUE);
-
- if (app->entry.label != NULL) {
- gtk_widget_show(GTK_WIDGET(app->entry.label));
- }
-
- if (app->entry.image != NULL) {
- indicator_image_helper_update(app->entry.image, app->longname);
- gtk_widget_show(GTK_WIDGET(app->entry.image));
- }
-
- g_signal_emit(G_OBJECT(application), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED_ID, 0, &(app->entry), TRUE);
- }
-
- return;
-}
-
-/* The callback for the signal that the icon for an application
- has changed. */
-static void
-application_icon_changed (DBusGProxy * proxy, gint position, const gchar * iconname, IndicatorApplication * application)
-{
- IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application);
- ApplicationEntry * app = (ApplicationEntry *)g_list_nth_data(priv->applications, position);
-
- if (app == NULL) {
- g_warning("Unable to find application at position: %d", position);
- return;
- }
-
- /* 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. */
- if (app->longname != NULL) {
- g_free(app->longname);
- app->longname = NULL;
- }
- if (!g_str_has_suffix(iconname, PANEL_ICON_SUFFIX)) {
- app->longname = g_strdup_printf("%s-%s", iconname, PANEL_ICON_SUFFIX);
- } else {
- app->longname = g_strdup(iconname);
- }
- indicator_image_helper_update(app->entry.image, app->longname);
-
- return;
-}
-
-/* The callback for the signal that the icon theme path for an application
- has changed. */
-static void
-application_icon_theme_path_changed (DBusGProxy * proxy, gint position, const gchar * icon_theme_path, IndicatorApplication * application)
-{
- IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application);
- ApplicationEntry * app = (ApplicationEntry *)g_list_nth_data(priv->applications, position);
-
- if (app == NULL) {
- g_warning("Unable to find application at position: %d", position);
- return;
- }
-
- if (g_strcmp0(icon_theme_path, app->icon_theme_path) != 0) {
- if(app->icon_theme_path != NULL) {
- theme_dir_unref(application, app->icon_theme_path);
- g_free(app->icon_theme_path);
- app->icon_theme_path = NULL;
- }
- if (icon_theme_path != NULL && icon_theme_path[0] != '\0') {
- app->icon_theme_path = g_strdup(icon_theme_path);
- theme_dir_ref(application, app->icon_theme_path);
- }
- indicator_image_helper_update(app->entry.image, app->longname);
- }
-
- return;
-}
-
-/* This repsonds to the list of applications that the service
- has and calls application_added on each one of them. */
-static void
-get_applications (DBusGProxy *proxy, GPtrArray *OUT_applications, GError *error, gpointer userdata)
-{
- if (error != NULL) {
- g_warning("Unable to get application list: %s", error->message);
- return;
- }
- g_ptr_array_foreach(OUT_applications, get_applications_helper, userdata);
-
- return;
-}
-
-/* A little helper that takes apart the DBus structure and calls
- application_added on every entry in the list. */
-static void
-get_applications_helper (gpointer data, gpointer user_data)
-{
- GValueArray * array = (GValueArray *)data;
-
- g_return_if_fail(array->n_values == 7);
-
- const gchar * icon_name = g_value_get_string(g_value_array_get_nth(array, 0));
- gint position = g_value_get_int(g_value_array_get_nth(array, 1));
- const gchar * dbus_address = g_value_get_string(g_value_array_get_nth(array, 2));
- const gchar * dbus_object = g_value_get_boxed(g_value_array_get_nth(array, 3));
- const gchar * icon_theme_path = g_value_get_string(g_value_array_get_nth(array, 4));
- const gchar * label = g_value_get_string(g_value_array_get_nth(array, 5));
- const gchar * guide = g_value_get_string(g_value_array_get_nth(array, 6));
-
- return application_added(NULL, icon_name, position, dbus_address, dbus_object, icon_theme_path, label, guide, user_data);
-}
-
-/* Unrefs a theme directory. This may involve removing it from
- the search path. */
-static void
-theme_dir_unref(IndicatorApplication * ia, const gchar * dir)
-{
- IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(ia);
-
- /* Grab the count for this dir */
- int count = GPOINTER_TO_INT(g_hash_table_lookup(priv->theme_dirs, dir));
-
- /* Is this a simple deprecation, if so, we can just lower the
- number and move on. */
- if (count > 1) {
- count--;
- g_hash_table_insert(priv->theme_dirs, g_strdup(dir), GINT_TO_POINTER(count));
- return;
- }
-
- /* Try to remove it from the hash table, this makes sure
- that it existed */
- if (!g_hash_table_remove(priv->theme_dirs, dir)) {
- g_warning("Unref'd a directory that wasn't in the theme dir hash table.");
- return;
- }
-
- GtkIconTheme * icon_theme = gtk_icon_theme_get_default();
- gchar ** paths;
- gint path_count;
-
- gtk_icon_theme_get_search_path(icon_theme, &paths, &path_count);
-
- gint i;
- gboolean found = FALSE;
- for (i = 0; i < path_count; i++) {
- if (found) {
- /* If we've already found the right entry */
- paths[i - 1] = paths[i];
- } else {
- /* We're still looking, is this the one? */
- if (!g_strcmp0(paths[i], dir)) {
- found = TRUE;
- /* We're freeing this here as it won't be captured by the
- g_strfreev() below as it's out of the array. */
- g_free(paths[i]);
- }
- }
- }
-
- /* If we found one we need to reset the path to
- accomidate the changes */
- if (found) {
- paths[path_count - 1] = NULL; /* Clear the last one */
- gtk_icon_theme_set_search_path(icon_theme, (const gchar **)paths, path_count - 1);
- }
-
- g_strfreev(paths);
-
- return;
-}
-
-/* Refs a theme directory, and it may add it to the search
- path */
-static void
-theme_dir_ref(IndicatorApplication * ia, const gchar * dir)
-{
- IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(ia);
-
- int count = 0;
- if ((count = GPOINTER_TO_INT(g_hash_table_lookup(priv->theme_dirs, dir))) != 0) {
- /* It exists so what we need to do is increase the ref
- count of this dir. */
- count++;
- } else {
- /* It doesn't exist, so we need to add it to the table
- and to the search path. */
- gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), dir);
- g_debug("\tAppending search path: %s", dir);
- count = 1;
- }
-
- g_hash_table_insert(priv->theme_dirs, g_strdup(dir), GINT_TO_POINTER(count));
-
- return;
-}
-
diff --git a/src/notification-approver.xml b/src/notification-approver.xml
deleted file mode 100644
index 4a8e39b..0000000
--- a/src/notification-approver.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<node name="/">
- <interface name="org.ayatana.StatusNotifierApprover">
-
-<!-- Methods -->
- <method name="ApproveItem">
- <!-- KSNI ID -->
- <arg type="s" name="id" direction="in" />
- <!-- KSNI Category -->
- <arg type="s" name="category" direction="in" />
- <!-- Application PID -->
- <arg type="u" name="pid" direction="in" />
- <!-- Application DBus Address -->
- <arg type="s" name="address" direction="in" />
- <!-- Application DBus Path for KSNI interface -->
- <arg type="o" name="path" direction="in" />
- <!-- So, what do you think? -->
- <arg type="b" name="approved" direction="out" />
- </method>
-
-<!-- Signals -->
- <signal name="ReviseJudgement">
- <arg type="b" name="approved" direction="out" />
- <arg type="s" name="address" direction="out" />
- <arg type="o" name="path" direction="out" />
- </signal>
-
- </interface>
-</node>