aboutsummaryrefslogtreecommitdiff
path: root/src/app-indicator.c
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-12-06 11:13:54 -0600
committerTed Gould <ted@gould.cx>2010-12-06 11:13:54 -0600
commit9287e2084f137024fc5d519a241f83ade387f3b0 (patch)
tree2da811c1416fd96ccafde37701abc5aced9f047d /src/app-indicator.c
parentf590403207e1f675983c90188c1d8d24ebb1d0c1 (diff)
downloadlibayatana-appindicator-9287e2084f137024fc5d519a241f83ade387f3b0.tar.gz
libayatana-appindicator-9287e2084f137024fc5d519a241f83ade387f3b0.tar.bz2
libayatana-appindicator-9287e2084f137024fc5d519a241f83ade387f3b0.zip
Building up the base inforation for the dbus interfaces as static globals
Diffstat (limited to 'src/app-indicator.c')
-rw-r--r--src/app-indicator.c47
1 files changed, 45 insertions, 2 deletions
diff --git a/src/app-indicator.c b/src/app-indicator.c
index 4886605..6403a9b 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -48,8 +48,8 @@ License version 3 and version 2.1 along with this program. If not, see
#include "app-indicator-enum-types.h"
#include "application-service-marshal.h"
-#include "notification-item-server.h"
-#include "notification-watcher-client.h"
+#include "notification-watcher.xml.h"
+#include "notification-item.xml.h"
#include "dbus-shared.h"
#include "generate-id.h"
@@ -165,6 +165,12 @@ enum {
/* More constants */
#define DEFAULT_FALLBACK_TIMER 100 /* in milliseconds */
+/* Globals */
+static GDBusNodeInfo * item_node_info = NULL;
+static GDBusInterfaceInfo * item_interface_info = NULL;
+static GDBusNodeInfo * watcher_node_info = NULL;
+static GDBusInterfaceInfo * watcher_interface_info = NULL;
+
/* Boiler plate */
static void app_indicator_class_init (AppIndicatorClass *klass);
static void app_indicator_init (AppIndicator *self);
@@ -542,6 +548,43 @@ app_indicator_class_init (AppIndicatorClass *klass)
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_STRING);
+ /* DBus interfaces */
+ if (item_node_info == NULL) {
+ GError * error = NULL;
+
+ item_node_info = g_dbus_node_info_new_for_xml(notification_item_xml, &error);
+ if (error != NULL) {
+ g_error("Unable to parse Notification Item DBus interface: %s", error->message);
+ g_error_free(error);
+ }
+ }
+
+ if (item_interface_info == NULL && item_node_info != NULL) {
+ item_interface_info = g_dbus_node_info_lookup_interface(item_node_info, NOTIFICATION_ITEM_DBUS_IFACE);
+
+ if (item_interface_info == NULL) {
+ g_error("Unable to find interface '" NOTIFICATION_ITEM_DBUS_IFACE "'");
+ }
+ }
+
+ if (watcher_node_info == NULL) {
+ GError * error = NULL;
+
+ watcher_node_info = g_dbus_node_info_new_for_xml(notification_watcher_xml, &error);
+ if (error != NULL) {
+ g_error("Unable to parse Notification Item DBus interface: %s", error->message);
+ g_error_free(error);
+ }
+ }
+
+ if (watcher_interface_info == NULL && watcher_node_info != NULL) {
+ watcher_interface_info = g_dbus_node_info_lookup_interface(watcher_node_info, NOTIFICATION_WATCHER_DBUS_IFACE);
+
+ if (watcher_interface_info == NULL) {
+ g_error("Unable to find interface '" NOTIFICATION_WATCHER_DBUS_IFACE "'");
+ }
+ }
+
/* Initialize the object as a DBus type */
dbus_g_object_type_install_info(APP_INDICATOR_TYPE,
&dbus_glib__notification_item_server_object_info);