aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-02-06 10:52:19 -0800
committerTed Gould <ted@gould.cx>2010-02-06 10:52:19 -0800
commit87a7acd9fc0069cb2f4fee96e42ee6651b35629f (patch)
tree9df306272469a7a6e05f60c8ffe480a13e84b320
parentf8ab455538c130ce03132e2557c9363e9a808156 (diff)
downloadlibayatana-appindicator-87a7acd9fc0069cb2f4fee96e42ee6651b35629f.tar.gz
libayatana-appindicator-87a7acd9fc0069cb2f4fee96e42ee6651b35629f.tar.bz2
libayatana-appindicator-87a7acd9fc0069cb2f4fee96e42ee6651b35629f.zip
Making room for a disconnected function.
-rw-r--r--src/indicator-application.c31
1 files changed, 28 insertions, 3 deletions
diff --git a/src/indicator-application.c b/src/indicator-application.c
index 6c053a9..c7789f1 100644
--- a/src/indicator-application.c
+++ b/src/indicator-application.c
@@ -95,7 +95,9 @@ static void indicator_application_dispose (GObject *object);
static void indicator_application_finalize (GObject *object);
static GList * get_entries (IndicatorObject * io);
static guint get_location (IndicatorObject * io, IndicatorObjectEntry * entry);
-static void connected (IndicatorServiceManager * sm, gboolean connected, IndicatorApplication * application);
+void connection_changed (IndicatorServiceManager * sm, gboolean connected, IndicatorApplication * application);
+static void connected (IndicatorApplication * application);
+static void disconnected (IndicatorApplication * application);
static void application_added (DBusGProxy * proxy, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_path, IndicatorApplication * application);
static void application_removed (DBusGProxy * proxy, gint position , IndicatorApplication * application);
static void application_icon_changed (DBusGProxy * proxy, gint position, const gchar * iconname, IndicatorApplication * application);
@@ -149,7 +151,7 @@ indicator_application_init (IndicatorApplication *self)
priv->theme_dirs = NULL;
priv->sm = indicator_service_manager_new(INDICATOR_APPLICATION_DBUS_ADDR);
- g_signal_connect(G_OBJECT(priv->sm), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connected), self);
+ g_signal_connect(G_OBJECT(priv->sm), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_changed), self);
priv->applications = NULL;
@@ -205,8 +207,23 @@ indicator_application_finalize (GObject *object)
return;
}
+/* Responds to connection change event from the service manager and
+ splits it into two. */
void
-connected (IndicatorServiceManager * sm, gboolean connected, IndicatorApplication * application)
+connection_changed (IndicatorServiceManager * sm, gboolean connect, IndicatorApplication * application)
+{
+ 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.");
@@ -278,6 +295,14 @@ connected (IndicatorServiceManager * sm, gboolean connected, IndicatorApplicatio
return;
}
+static void
+disconnected (IndicatorApplication * application)
+{
+
+
+ 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. */