aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2009-12-04 14:48:18 -0600
committerTed Gould <ted@gould.cx>2009-12-04 14:48:18 -0600
commit549868147d2bbf6e68df4134d1a1c12d29691f25 (patch)
tree79ac792d56f3bee5a4090c5d85e61647e96380cf
parent25d7d9956bb04408438d813cf222e3df59bd0518 (diff)
parent2906ee43d836d60912a8aa66f202a63cadc083d1 (diff)
downloadayatana-indicator-application-549868147d2bbf6e68df4134d1a1c12d29691f25.tar.gz
ayatana-indicator-application-549868147d2bbf6e68df4134d1a1c12d29691f25.tar.bz2
ayatana-indicator-application-549868147d2bbf6e68df4134d1a1c12d29691f25.zip
* Upstream release 0.0.2
* Updates API to use GTK instead of dbusmenu to make it easier for upstream developers to use.
-rw-r--r--configure.ac4
-rw-r--r--debian/changelog8
-rw-r--r--example/simple-client.c37
-rw-r--r--src/libappindicator/app-indicator.c773
-rw-r--r--src/libappindicator/app-indicator.h82
-rw-r--r--tests/test-libappindicator-dbus-client.c48
-rw-r--r--tests/test-libappindicator-dbus-server.c25
-rw-r--r--tests/test-libappindicator.c29
-rw-r--r--tests/test-simple-app.c1
9 files changed, 438 insertions, 569 deletions
diff --git a/configure.ac b/configure.ac
index 2783f85..1b5e120 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT(indicator-application, 0.0.1, ted@canonical.com)
+AC_INIT(indicator-application, 0.0.2, ted@canonical.com)
AC_COPYRIGHT([Copyright 2009 Canonical])
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-application, 0.0.1)
+AM_INIT_AUTOMAKE(indicator-application, 0.0.2)
AM_MAINTAINER_MODE
diff --git a/debian/changelog b/debian/changelog
index 12af0a4..c9d1a6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+indicator-application (0.0.2-0ubuntu1~ppa1) UNRELEASED; urgency=low
+
+ * Upstream release 0.0.2
+ * Updates API to use GTK instead of dbusmenu to make it
+ easier for upstream developers to use.
+
+ -- Ted Gould <ted@ubuntu.com> Fri, 04 Dec 2009 14:47:25 -0600
+
indicator-application (0.0.1-0ubuntu3~ppa4) karmic; urgency=low
* Adding in copyright headers and licenses
diff --git a/example/simple-client.c b/example/simple-client.c
index 80d6d9c..ab2e24d 100644
--- a/example/simple-client.c
+++ b/example/simple-client.c
@@ -29,31 +29,32 @@ GMainLoop * mainloop = NULL;
int
main (int argc, char ** argv)
{
- g_type_init();
+ GtkWidget *menu = NULL;
+ AppIndicator *ci = NULL;
- AppIndicator * ci = APP_INDICATOR(g_object_new(APP_INDICATOR_TYPE, NULL));
- g_assert(ci != NULL);
+ gtk_init (&argc, &argv);
- app_indicator_set_id(ci, "example-simple-client");
- app_indicator_set_category(ci, APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
- app_indicator_set_status(ci, APP_INDICATOR_STATUS_ACTIVE);
- app_indicator_set_icon(ci, "indicator-messages");
- app_indicator_set_attention_icon(ci, "indicator-messages-new");
+ ci = app_indicator_new ("example-simple-client",
+ "indicator-messages",
+ APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
+
+ g_assert (IS_APP_INDICATOR (ci));
+ g_assert (G_IS_OBJECT (ci));
- DbusmenuMenuitem * root = dbusmenu_menuitem_new();
+ app_indicator_set_status (ci, APP_INDICATOR_STATUS_ACTIVE);
+ app_indicator_set_attention_icon(ci, "indicator-messages-new");
- DbusmenuMenuitem * item = dbusmenu_menuitem_new();
- dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, "Item 1");
- dbusmenu_menuitem_child_append(root, item);
+ menu = gtk_menu_new ();
+ GtkWidget *item = gtk_menu_item_new_with_label ("1");
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- item = dbusmenu_menuitem_new();
- dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, "Item 2");
- dbusmenu_menuitem_child_append(root, item);
+ item = gtk_menu_item_new_with_label ("2");
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- DbusmenuServer * menuservice = dbusmenu_server_new ("/need/a/menu/path");
- dbusmenu_server_set_root(menuservice, root);
+ item = gtk_menu_item_new_with_label ("3");
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- app_indicator_set_menu(ci, menuservice);
+ app_indicator_set_menu (ci, GTK_MENU (menu));
mainloop = g_main_loop_new(NULL, FALSE);
g_main_loop_run(mainloop);
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index 141e1c0..f61723d 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -6,23 +6,24 @@ Copyright 2009 Canonical Ltd.
Authors:
Ted Gould <ted@canonical.com>
+ Cody Russell <cody.russell@canonical.com>
-This program is free software: you can redistribute it and/or modify it
+This program is free software: you can redistribute it and/or modify it
under the terms of either or both of the following licenses:
-1) the GNU Lesser General Public License version 3, as published by the
+1) the GNU Lesser General Public License version 3, as published by the
Free Software Foundation; and/or
-2) the GNU Lesser General Public License version 2.1, as published by
+2) the GNU Lesser General Public License version 2.1, 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 applicable version of the GNU Lesser General Public
+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 applicable version of the GNU Lesser General Public
License for more details.
-You should have received a copy of both the GNU Lesser General Public
-License version 3 and version 2.1 along with this program. If not, see
+You should have received a copy of both the GNU Lesser General Public
+License version 3 and version 2.1 along with this program. If not, see
<http://www.gnu.org/licenses/>
*/
@@ -54,19 +55,19 @@ License version 3 and version 2.1 along with this program. If not, see
All of the private data in an instance of a
application indicator.
*/
-typedef struct _AppIndicatorPrivate AppIndicatorPrivate;
struct _AppIndicatorPrivate {
/* Properties */
- gchar * id;
- AppIndicatorCategory category;
- AppIndicatorStatus status;
- gchar * icon_name;
- gchar * attention_icon_name;
- DbusmenuServer * menu;
+ gchar *id;
+ AppIndicatorCategory category;
+ AppIndicatorStatus status;
+ gchar *icon_name;
+ gchar *attention_icon_name;
+ DbusmenuServer *menuservice;
+ GtkWidget *menu;
/* Fun stuff */
- DBusGProxy * watcher_proxy;
- DBusGConnection * connection;
+ DBusGProxy *watcher_proxy;
+ DBusGConnection *connection;
};
/* Signals Stuff */
@@ -86,26 +87,20 @@ enum {
PROP_0,
PROP_ID,
PROP_CATEGORY,
- PROP_CATEGORY_ENUM,
PROP_STATUS,
- PROP_STATUS_ENUM,
PROP_ICON_NAME,
PROP_ATTENTION_ICON_NAME,
PROP_MENU,
- PROP_MENU_OBJECT,
PROP_CONNECTED
};
/* The strings so that they can be slowly looked up. */
#define PROP_ID_S "id"
#define PROP_CATEGORY_S "category"
-#define PROP_CATEGORY_ENUM_S "category-enum"
#define PROP_STATUS_S "status"
-#define PROP_STATUS_ENUM_S "status-enum"
#define PROP_ICON_NAME_S "icon-name"
#define PROP_ATTENTION_ICON_NAME_S "attention-icon-name"
#define PROP_MENU_S "menu"
-#define PROP_MENU_OBJECT_S "menu-object"
#define PROP_CONNECTED_S "connected"
/* Private macro, shhhh! */
@@ -143,77 +138,61 @@ app_indicator_class_init (AppIndicatorClass *klass)
object_class->get_property = app_indicator_get_property;
/* Properties */
- g_object_class_install_property(object_class, PROP_ID,
- g_param_spec_string(PROP_ID_S,
- "The ID for this indicator",
- "An ID that should be unique, but used consistently by this program and it's indicator.",
- NULL,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property(object_class, PROP_CATEGORY,
- g_param_spec_string(PROP_CATEGORY_S,
- "Indicator Category as a string",
- "The type of indicator that this represents as a string. For DBus.",
- NULL,
- G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property(object_class, PROP_CATEGORY_ENUM,
- g_param_spec_enum(PROP_CATEGORY_ENUM_S,
- "Indicator Category",
- "The type of indicator that this represents. Please don't use 'other'. Defaults to 'Application Status'.",
- APP_INDICATOR_TYPE_INDICATOR_CATEGORY,
- APP_INDICATOR_CATEGORY_APPLICATION_STATUS,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property(object_class, PROP_STATUS,
- g_param_spec_string(PROP_STATUS_S,
- "Indicator Status as a string",
- "The status of the indicator represented as a string. For DBus.",
- NULL,
- G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property(object_class, PROP_STATUS_ENUM,
- g_param_spec_enum(PROP_STATUS_ENUM_S,
- "Indicator Status",
- "Whether the indicator is shown or requests attention. Defaults to 'off'.",
- APP_INDICATOR_TYPE_INDICATOR_STATUS,
- APP_INDICATOR_STATUS_PASSIVE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property(object_class, PROP_ICON_NAME,
- g_param_spec_string(PROP_ICON_NAME_S,
- "An icon for the indicator",
- "The default icon that is shown for the indicator.",
- NULL,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property(object_class, PROP_ATTENTION_ICON_NAME,
- g_param_spec_string(PROP_ATTENTION_ICON_NAME_S,
- "An icon to show when the indicator request attention.",
- "If the indicator sets it's status to 'attention' then this icon is shown.",
- NULL,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property(object_class, PROP_MENU,
- g_param_spec_string(PROP_MENU_S,
- "The object path of the menu on DBus.",
- "A method for getting the menu path as a string for DBus.",
- NULL,
- G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property(object_class, PROP_MENU_OBJECT,
- g_param_spec_object(PROP_MENU_OBJECT_S,
- "The Menu for the indicator",
- "A DBus Menu Server object that can have a menu attached to it. The object from this menu will be sent across the bus for the client to connect to and signal.",
- DBUSMENU_TYPE_SERVER,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property(object_class, PROP_CONNECTED,
- g_param_spec_boolean(PROP_CONNECTED_S,
- "Whether we're conneced to a watcher",
- "Pretty simple, true if we have a reasonable expectation of being displayed through this object. You should hide your TrayIcon if so.",
- FALSE,
- G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+ g_object_class_install_property (object_class,
+ PROP_ID,
+ g_param_spec_string(PROP_ID_S,
+ "The ID for this indicator",
+ "An ID that should be unique, but used consistently by this program and it's indicator.",
+ NULL,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY));
+
+ g_object_class_install_property (object_class,
+ PROP_CATEGORY,
+ g_param_spec_string (PROP_CATEGORY_S,
+ "Indicator Category",
+ "The type of indicator that this represents. Please don't use 'other'. Defaults to 'Application Status'.",
+ NULL,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY));
+
+ g_object_class_install_property (object_class,
+ PROP_STATUS,
+ g_param_spec_string (PROP_STATUS_S,
+ "Indicator Status",
+ "Whether the indicator is shown or requests attention. Defaults to 'off'.",
+ NULL,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property(object_class,
+ PROP_ICON_NAME,
+ g_param_spec_string (PROP_ICON_NAME_S,
+ "An icon for the indicator",
+ "The default icon that is shown for the indicator.",
+ NULL,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (object_class,
+ PROP_ATTENTION_ICON_NAME,
+ g_param_spec_string (PROP_ATTENTION_ICON_NAME_S,
+ "An icon to show when the indicator request attention.",
+ "If the indicator sets it's status to 'attention' then this icon is shown.",
+ NULL,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property(object_class,
+ PROP_MENU,
+ g_param_spec_string (PROP_MENU_S,
+ "The object path of the menu on DBus.",
+ "A method for getting the menu path as a string for DBus.",
+ NULL,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (object_class,
+ PROP_CONNECTED,
+ g_param_spec_boolean (PROP_CONNECTED_S,
+ "Whether we're conneced to a watcher",
+ "Pretty simple, true if we have a reasonable expectation of being displayed through this object. You should hide your TrayIcon if so.",
+ FALSE,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/* Signals */
@@ -221,7 +200,7 @@ app_indicator_class_init (AppIndicatorClass *klass)
/**
AppIndicator::new-icon:
@arg0: The #AppIndicator object
-
+
Signaled when there is a new icon set for the
object.
*/
@@ -236,7 +215,7 @@ app_indicator_class_init (AppIndicatorClass *klass)
/**
AppIndicator::new-attention-icon:
@arg0: The #AppIndicator object
-
+
Signaled when there is a new attention icon set for the
object.
*/
@@ -252,7 +231,7 @@ app_indicator_class_init (AppIndicatorClass *klass)
AppIndicator::new-status:
@arg0: The #AppIndicator object
@arg1: The string value of the #AppIndicatorStatus enum.
-
+
Signaled when the status of the indicator changes.
*/
signals[NEW_STATUS] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_STATUS,
@@ -261,13 +240,14 @@ app_indicator_class_init (AppIndicatorClass *klass)
G_STRUCT_OFFSET (AppIndicatorClass, new_status),
NULL, NULL,
g_cclosure_marshal_VOID__STRING,
- G_TYPE_NONE, 1, G_TYPE_STRING, G_TYPE_NONE);
+ G_TYPE_NONE, 1,
+ G_TYPE_STRING);
/**
AppIndicator::connection-changed:
@arg0: The #AppIndicator object
@arg1: Whether we're connected or not
-
+
Signaled when we connect to a watcher, or when it drops
away.
*/
@@ -278,7 +258,7 @@ app_indicator_class_init (AppIndicatorClass *klass)
NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN, G_TYPE_NONE);
-
+
/* Initialize the object as a DBus type */
dbus_g_object_type_install_info(APP_INDICATOR_TYPE,
&dbus_glib__notification_item_server_object_info);
@@ -314,6 +294,8 @@ app_indicator_init (AppIndicator *self)
"/need/a/path",
G_OBJECT(self));
+ self->priv = priv;
+
return;
}
@@ -322,10 +304,8 @@ app_indicator_init (AppIndicator *self)
static void
app_indicator_dispose (GObject *object)
{
- AppIndicator * self = APP_INDICATOR(object);
- g_return_if_fail(self != NULL);
-
- AppIndicatorPrivate * priv = APP_INDICATOR_GET_PRIVATE(self);
+ AppIndicator *self = APP_INDICATOR (object);
+ AppIndicatorPrivate *priv = self->priv;
if (priv->status != APP_INDICATOR_STATUS_PASSIVE) {
app_indicator_set_status(self, APP_INDICATOR_STATUS_PASSIVE);
@@ -351,10 +331,8 @@ app_indicator_dispose (GObject *object)
static void
app_indicator_finalize (GObject *object)
{
- AppIndicator * self = APP_INDICATOR(object);
- g_return_if_fail(self != NULL);
-
- AppIndicatorPrivate * priv = APP_INDICATOR_GET_PRIVATE(self);
+ AppIndicator * self = APP_INDICATOR(object);
+ AppIndicatorPrivate *priv = self->priv;
if (priv->status != APP_INDICATOR_STATUS_PASSIVE) {
g_warning("Finalizing Application Status with the status set to: %d", priv->status);
@@ -385,117 +363,68 @@ app_indicator_finalize (GObject *object)
static void
app_indicator_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec)
{
- AppIndicator * self = APP_INDICATOR(object);
- g_return_if_fail(self != NULL);
+ AppIndicator *self = APP_INDICATOR (object);
+ AppIndicatorPrivate *priv = self->priv;
+ const gchar *instr;
+ GEnumValue *enum_val;
- AppIndicatorPrivate * priv = APP_INDICATOR_GET_PRIVATE(self);
+ switch (prop_id) {
+ case PROP_ID:
+ if (priv->id != NULL) {
+ g_warning ("Resetting ID value when I already had a value of: %s", priv->id);
+ g_free (priv->id);
+ priv->id = NULL;
+ }
- switch (prop_id) {
- /* *********************** */
- case PROP_ID:
- if (G_VALUE_HOLDS_STRING(value)) {
- if (priv->id != NULL) {
- g_warning("Resetting ID value when I already had a value of: %s", priv->id);
- g_free(priv->id);
- priv->id = NULL;
- }
- priv->id = g_strdup(g_value_get_string(value));
- } else {
- WARN_BAD_TYPE(PROP_ID_S, value);
- }
- check_connect(self);
- break;
- /* *********************** */
- case PROP_CATEGORY_ENUM:
- if (G_VALUE_HOLDS_ENUM(value)) {
- priv->category = g_value_get_enum(value);
- } else {
- WARN_BAD_TYPE(PROP_CATEGORY_ENUM_S, value);
- }
- break;
- /* *********************** */
- case PROP_STATUS_ENUM: {
- gboolean changed = FALSE;
- if (G_VALUE_HOLDS_ENUM(value)) {
- if (priv->status != g_value_get_enum(value)) {
- changed = TRUE;
- }
- priv->status = g_value_get_enum(value);
- } else {
- WARN_BAD_TYPE(PROP_STATUS_ENUM_S, value);
- }
- if (changed) {
- GParamSpecEnum * enumspec = G_PARAM_SPEC_ENUM(pspec);
- if (enumspec != NULL) {
- GEnumValue * enumval = g_enum_get_value(enumspec->enum_class, priv->status);
- g_signal_emit(object, signals[NEW_STATUS], 0, enumval->value_nick, TRUE);
- }
- }
- break;
- }
- /* *********************** */
- case PROP_ICON_NAME:
- if (G_VALUE_HOLDS_STRING(value)) {
- const gchar * instr = g_value_get_string(value);
- gboolean changed = FALSE;
- if (priv->icon_name == NULL) {
- priv->icon_name = g_strdup(instr);
- changed = TRUE;
- } else if (!g_strcmp0(instr, priv->icon_name)) {
- changed = FALSE;
- } else {
- g_free(priv->icon_name);
- priv->icon_name = g_strdup(instr);
- changed = TRUE;
- }
- if (changed) {
- g_signal_emit(object, signals[NEW_ICON], 0, TRUE);
- }
- } else {
- WARN_BAD_TYPE(PROP_ICON_NAME_S, value);
- }
- check_connect(self);
- break;
- /* *********************** */
- case PROP_ATTENTION_ICON_NAME:
- if (G_VALUE_HOLDS_STRING(value)) {
- const gchar * instr = g_value_get_string(value);
- gboolean changed = FALSE;
- if (priv->attention_icon_name == NULL) {
- priv->attention_icon_name = g_strdup(instr);
- changed = TRUE;
- } else if (!g_strcmp0(instr, priv->attention_icon_name)) {
- changed = FALSE;
- } else {
- g_free(priv->attention_icon_name);
- priv->attention_icon_name = g_strdup(instr);
- changed = TRUE;
- }
- if (changed) {
- g_signal_emit(object, signals[NEW_ATTENTION_ICON], 0, TRUE);
- }
- } else {
- WARN_BAD_TYPE(PROP_ATTENTION_ICON_NAME_S, value);
- }
- break;
- /* *********************** */
- case PROP_MENU_OBJECT:
- if (G_VALUE_HOLDS_OBJECT(value)) {
- if (priv->menu != NULL) {
- g_object_unref(G_OBJECT(priv->menu));
- }
- priv->menu = DBUSMENU_SERVER(g_value_get_object(value));
- g_object_ref(G_OBJECT(priv->menu));
- } else {
- WARN_BAD_TYPE(PROP_MENU_S, value);
- }
- check_connect(self);
- break;
- /* *********************** */
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
+ priv->id = g_strdup (g_value_get_string (value));
+
+ check_connect (self);
+ break;
+
+ case PROP_CATEGORY:
+ enum_val = g_enum_get_value_by_nick ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_CATEGORY),
+ g_value_get_string (value));
+
+ if (priv->category != enum_val->value)
+ {
+ priv->category = enum_val->value;
+ }
+
+ break;
+
+ case PROP_STATUS:
+ enum_val = g_enum_get_value_by_nick ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_STATUS),
+ g_value_get_string (value));
+
+ app_indicator_set_status (APP_INDICATOR (object),
+ enum_val->value);
+ break;
+
+ case PROP_ICON_NAME:
+ instr = g_value_get_string (value);
+
+ if (g_strcmp0 (priv->icon_name, instr) != 0)
+ {
+ if (priv->icon_name)
+ g_free (priv->icon_name);
+
+ priv->icon_name = g_strdup (instr);
+
+ g_signal_emit (self, signals[NEW_ICON], 0, TRUE);
+ }
+
+ check_connect (self);
+ break;
+
+ case PROP_ATTENTION_ICON_NAME:
+ app_indicator_set_attention_icon (APP_INDICATOR (object),
+ g_value_get_string (value));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
return;
}
@@ -504,115 +433,51 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu
static void
app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec)
{
- AppIndicator * self = APP_INDICATOR(object);
- g_return_if_fail(self != NULL);
-
- AppIndicatorPrivate * priv = APP_INDICATOR_GET_PRIVATE(self);
-
- switch (prop_id) {
- /* *********************** */
- case PROP_ID:
- if (G_VALUE_HOLDS_STRING(value)) {
- g_value_set_string(value, priv->id);
- } else {
- WARN_BAD_TYPE(PROP_ID_S, value);
- }
- break;
- /* *********************** */
- case PROP_CATEGORY:
- if (G_VALUE_HOLDS_STRING(value)) {
- GParamSpec * spec_for_enum = g_object_class_find_property(G_OBJECT_GET_CLASS(object), PROP_CATEGORY_ENUM_S);
- GParamSpecEnum * enumspec = G_PARAM_SPEC_ENUM(spec_for_enum);
- if (enumspec != NULL) {
- GEnumValue * enumval = g_enum_get_value(enumspec->enum_class, priv->category);
- g_value_set_string(value, enumval->value_nick);
- } else {
- g_assert_not_reached();
- }
- } else {
- WARN_BAD_TYPE(PROP_CATEGORY_S, value);
- }
- break;
- /* *********************** */
- case PROP_CATEGORY_ENUM:
- if (G_VALUE_HOLDS_ENUM(value)) {
- /* We want the enum value */
- g_value_set_enum(value, priv->category);
- } else {
- WARN_BAD_TYPE(PROP_CATEGORY_ENUM_S, value);
- }
- break;
- /* *********************** */
- case PROP_STATUS:
- if (G_VALUE_HOLDS_STRING(value)) {
- GParamSpec * spec_for_enum = g_object_class_find_property(G_OBJECT_GET_CLASS(object), PROP_STATUS_ENUM_S);
- GParamSpecEnum * enumspec = G_PARAM_SPEC_ENUM(spec_for_enum);
- if (enumspec != NULL) {
- GEnumValue * enumval = g_enum_get_value(enumspec->enum_class, priv->status);
- g_value_set_string(value, enumval->value_nick);
- } else {
- g_assert_not_reached();
- }
- } else {
- WARN_BAD_TYPE(PROP_STATUS_S, value);
- }
- break;
- /* *********************** */
- case PROP_STATUS_ENUM:
- if (G_VALUE_HOLDS_ENUM(value)) {
- /* We want the enum value */
- g_value_set_enum(value, priv->status);
- } else {
- WARN_BAD_TYPE(PROP_STATUS_ENUM_S, value);
- }
- break;
- /* *********************** */
- case PROP_ICON_NAME:
- if (G_VALUE_HOLDS_STRING(value)) {
- g_value_set_string(value, priv->icon_name);
- } else {
- WARN_BAD_TYPE(PROP_ICON_NAME_S, value);
- }
- break;
- /* *********************** */
- case PROP_ATTENTION_ICON_NAME:
- if (G_VALUE_HOLDS_STRING(value)) {
- g_value_set_string(value, priv->attention_icon_name);
- } else {
- WARN_BAD_TYPE(PROP_ATTENTION_ICON_NAME_S, value);
- }
- break;
- /* *********************** */
- case PROP_MENU:
- if (G_VALUE_HOLDS_STRING(value)) {
- if (priv->menu != NULL) {
- g_object_get_property(G_OBJECT(priv->menu), DBUSMENU_SERVER_PROP_DBUS_OBJECT, value);
- }
- } else {
- WARN_BAD_TYPE(PROP_MENU_S, value);
- }
- break;
- /* *********************** */
- case PROP_MENU_OBJECT:
- if (G_VALUE_HOLDS_OBJECT(value)) {
- g_value_set_object(value, priv->menu);
- } else {
- WARN_BAD_TYPE(PROP_MENU_OBJECT_S, value);
- }
- break;
- /* *********************** */
- case PROP_CONNECTED:
- if (G_VALUE_HOLDS_BOOLEAN(value)) {
- g_value_set_boolean(value, priv->watcher_proxy != NULL ? TRUE : FALSE);
- } else {
- WARN_BAD_TYPE(PROP_CONNECTED_S, value);
- }
- break;
- /* *********************** */
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
+ AppIndicator *self = APP_INDICATOR (object);
+ AppIndicatorPrivate *priv = self->priv;
+ GEnumValue *enum_value;
+
+ switch (prop_id) {
+ case PROP_ID:
+ g_value_set_string (value, priv->id);
+ break;
+
+ case PROP_CATEGORY:
+ enum_value = g_enum_get_value ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_CATEGORY), priv->category);
+ g_value_set_string (value, enum_value->value_nick);
+ break;
+
+ case PROP_STATUS:
+ enum_value = g_enum_get_value ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_STATUS), priv->status);
+ g_value_set_string (value, enum_value->value_nick);
+ break;
+
+ case PROP_ICON_NAME:
+ g_value_set_string (value, priv->icon_name);
+ break;
+
+ case PROP_ATTENTION_ICON_NAME:
+ g_value_set_string (value, priv->attention_icon_name);
+ break;
+
+ case PROP_MENU:
+ if (G_VALUE_HOLDS_STRING(value)) {
+ if (priv->menuservice != NULL) {
+ g_object_get_property (G_OBJECT (priv->menuservice), DBUSMENU_SERVER_PROP_DBUS_OBJECT, value);
+ }
+ } else {
+ WARN_BAD_TYPE(PROP_MENU_S, value);
+ }
+ break;
+
+ case PROP_CONNECTED:
+ g_value_set_boolean (value, priv->watcher_proxy != NULL ? TRUE : FALSE);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
return;
}
@@ -621,9 +486,9 @@ app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GPa
connect to things. If we do, and we're not connected, it
connects for us. */
static void
-check_connect (AppIndicator * self)
+check_connect (AppIndicator *self)
{
- AppIndicatorPrivate * priv = APP_INDICATOR_GET_PRIVATE(self);
+ AppIndicatorPrivate *priv = self->priv;
/* We're alreadying connecting or trying to connect. */
if (priv->watcher_proxy != NULL) return;
@@ -664,43 +529,40 @@ register_service_cb (DBusGProxy * proxy, GError * error, gpointer data)
return;
}
+static const gchar *
+category_from_enum (AppIndicatorCategory category)
+{
+ GEnumValue *value;
+
+ value = g_enum_get_value ((GEnumClass *)g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_CATEGORY), category);
+ return value->value_nick;
+}
+
/* ************************* */
/* Public Functions */
/* ************************* */
/**
- app_indicator_set_id:
- @ci: The #AppIndicator object to use
- @id: ID to set for this indicator
-
- Wrapper function for property #AppIndicator::id.
-*/
-void
-app_indicator_set_id (AppIndicator * ci, const gchar * id)
+ app_indicator_new:
+ @id: The unique id of the indicator to create.
+ @icon_name: The icon name for this indicator
+ @category: The category of indicator.
+
+ @returns: A pointer to a new #AppIndicator object.
+ */
+AppIndicator *
+app_indicator_new (const gchar *id,
+ const gchar *icon_name,
+ AppIndicatorCategory category)
{
- GValue value = {0};
- g_value_init(&value, G_TYPE_STRING);
- g_value_set_string(&value, id);
- g_object_set_property(G_OBJECT(ci), PROP_ID_S, &value);
- return;
-}
-
-/**
- app_indicator_set_category:
- @ci: The #AppIndicator object to use
- @category: The category to set for this indicator
+ AppIndicator *indicator = g_object_new (APP_INDICATOR_TYPE,
+ "id", id,
+ "category", category_from_enum (category),
+ "icon-name", icon_name,
+ NULL);
- Wrapper function for property #AppIndicator::category.
-*/
-void
-app_indicator_set_category (AppIndicator * ci, AppIndicatorCategory category)
-{
- GValue value = {0};
- g_value_init(&value, APP_INDICATOR_TYPE_INDICATOR_CATEGORY);
- g_value_set_enum(&value, category);
- g_object_set_property(G_OBJECT(ci), PROP_CATEGORY_ENUM_S, &value);
- return;
+ return indicator;
}
/**
@@ -711,29 +573,17 @@ app_indicator_set_category (AppIndicator * ci, AppIndicatorCategory category)
Wrapper function for property #AppIndicator::status.
*/
void
-app_indicator_set_status (AppIndicator * ci, AppIndicatorStatus status)
+app_indicator_set_status (AppIndicator *self, AppIndicatorStatus status)
{
- GValue value = {0};
- g_value_init(&value, APP_INDICATOR_TYPE_INDICATOR_STATUS);
- g_value_set_enum(&value, status);
- g_object_set_property(G_OBJECT(ci), PROP_STATUS_ENUM_S, &value);
- return;
-}
+ g_return_if_fail (IS_APP_INDICATOR (self));
-/**
- app_indicator_set_icon:
- @ci: The #AppIndicator object to use
- @icon_name: The name of the icon to set for this indicator
+ if (self->priv->status != status)
+ {
+ GEnumValue *value = g_enum_get_value ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_STATUS), status);
- Wrapper function for property #AppIndicator::icon.
-*/
-void app_indicator_set_icon (AppIndicator * ci, const gchar * icon_name)
-{
- GValue value = {0};
- g_value_init(&value, G_TYPE_STRING);
- g_value_set_string(&value, icon_name);
- g_object_set_property(G_OBJECT(ci), PROP_ICON_NAME_S, &value);
- return;
+ self->priv->status = status;
+ g_signal_emit (self, signals[NEW_STATUS], 0, value->value_nick);
+ }
}
/**
@@ -744,30 +594,101 @@ void app_indicator_set_icon (AppIndicator * ci, const gchar * icon_name)
Wrapper function for property #AppIndicator::attention-icon.
*/
void
-app_indicator_set_attention_icon (AppIndicator * ci, const gchar * icon_name)
+app_indicator_set_attention_icon (AppIndicator *self, const gchar *icon_name)
{
- GValue value = {0};
- g_value_init(&value, G_TYPE_STRING);
- g_value_set_string(&value, icon_name);
- g_object_set_property(G_OBJECT(ci), PROP_ATTENTION_ICON_NAME_S, &value);
- return;
+ g_return_if_fail (IS_APP_INDICATOR (self));
+ g_return_if_fail (icon_name != NULL);
+
+ if (g_strcmp0 (self->priv->attention_icon_name, icon_name) != 0)
+ {
+ if (self->priv->attention_icon_name)
+ g_free (self->priv->attention_icon_name);
+
+ self->priv->attention_icon_name = g_strdup (icon_name);
+
+ g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0, TRUE);
+ }
}
/**
- app_indicator_set_menu:
- @ci: The #AppIndicator object to use
- @menu: The object with the menu for the indicator
+ app_indicator_set_icon:
+ @self: The #AppIndicator object to use
+ @icon_name: The icon name to set.
+**/
+void
+app_indicator_set_icon (AppIndicator *self, const gchar *icon_name)
+{
+ g_return_if_fail (IS_APP_INDICATOR (self));
+ g_return_if_fail (icon_name != NULL);
- Wrapper function for property #AppIndicator::menu.
-*/
+ if (g_strcmp0 (self->priv->attention_icon_name, icon_name) != 0)
+ {
+ if (self->priv->attention_icon_name)
+ g_free (self->priv->attention_icon_name);
+
+ self->priv->attention_icon_name = g_strdup (icon_name);
+
+ g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0, TRUE);
+ }
+}
+
+static void
+container_iterate (GtkWidget *widget,
+ gpointer data)
+{
+ DbusmenuMenuitem *root = (DbusmenuMenuitem *)data;
+ DbusmenuMenuitem *child;
+
+ child = dbusmenu_menuitem_new ();
+ dbusmenu_menuitem_property_set (child,
+ DBUSMENU_MENUITEM_PROP_LABEL,
+ gtk_menu_item_get_label (GTK_MENU_ITEM (widget)));
+ dbusmenu_menuitem_child_append (root, child);
+}
+
+static void
+setup_dbusmenu (AppIndicator *self)
+{
+ AppIndicatorPrivate *priv;
+ DbusmenuMenuitem *root;
+
+ priv = self->priv;
+ root = dbusmenu_menuitem_new ();
+
+ gtk_container_forall (GTK_CONTAINER (priv->menu),
+ container_iterate,
+ root);
+
+ priv->menuservice = dbusmenu_server_new ("/need/a/menu/path");
+ dbusmenu_server_set_root (priv->menuservice, root);
+}
+
+/**
+ app_indicator_set_menu:
+ @self: The #AppIndicator
+ @menu: A #GtkMenu to set
+**/
void
-app_indicator_set_menu (AppIndicator * ci, DbusmenuServer * menu)
+app_indicator_set_menu (AppIndicator *self, GtkMenu *menu)
{
- GValue value = {0};
- g_value_init(&value, G_TYPE_OBJECT);
- g_value_set_object(&value, G_OBJECT(menu));
- g_object_set_property(G_OBJECT(ci), PROP_MENU_OBJECT_S, &value);
- return;
+ AppIndicatorPrivate *priv;
+
+ g_return_if_fail (IS_APP_INDICATOR (self));
+ g_return_if_fail (GTK_IS_MENU (menu));
+
+ priv = self->priv;
+
+ if (priv->menu != NULL)
+ {
+ g_object_unref (priv->menu);
+ }
+
+ priv->menu = GTK_WIDGET (menu);
+ g_object_ref (priv->menu);
+
+ setup_dbusmenu (self);
+
+ check_connect (self);
}
/**
@@ -779,12 +700,11 @@ app_indicator_set_menu (AppIndicator * ci, DbusmenuServer * menu)
Return value: The current ID
*/
const gchar *
-app_indicator_get_id (AppIndicator * ci)
+app_indicator_get_id (AppIndicator *self)
{
- GValue value = {0};
- g_value_init(&value, G_TYPE_STRING);
- g_object_get_property(G_OBJECT(ci), PROP_ID_S, &value);
- return g_value_get_string(&value);
+ g_return_val_if_fail (IS_APP_INDICATOR (self), NULL);
+
+ return self->priv->id;
}
/**
@@ -796,12 +716,11 @@ app_indicator_get_id (AppIndicator * ci)
Return value: The current category.
*/
AppIndicatorCategory
-app_indicator_get_category (AppIndicator * ci)
+app_indicator_get_category (AppIndicator *self)
{
- GValue value = {0};
- g_value_init(&value, APP_INDICATOR_TYPE_INDICATOR_CATEGORY);
- g_object_get_property(G_OBJECT(ci), PROP_CATEGORY_ENUM_S, &value);
- return g_value_get_enum(&value);
+ g_return_val_if_fail (IS_APP_INDICATOR (self), APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
+
+ return self->priv->category;
}
/**
@@ -813,12 +732,11 @@ app_indicator_get_category (AppIndicator * ci)
Return value: The current status.
*/
AppIndicatorStatus
-app_indicator_get_status (AppIndicator * ci)
+app_indicator_get_status (AppIndicator *self)
{
- GValue value = {0};
- g_value_init(&value, APP_INDICATOR_TYPE_INDICATOR_STATUS);
- g_object_get_property(G_OBJECT(ci), PROP_STATUS_ENUM_S, &value);
- return g_value_get_enum(&value);
+ g_return_val_if_fail (IS_APP_INDICATOR (self), APP_INDICATOR_STATUS_PASSIVE);
+
+ return self->priv->status;
}
/**
@@ -830,12 +748,11 @@ app_indicator_get_status (AppIndicator * ci)
Return value: The current icon name.
*/
const gchar *
-app_indicator_get_icon (AppIndicator * ci)
+app_indicator_get_icon (AppIndicator *self)
{
- GValue value = {0};
- g_value_init(&value, G_TYPE_STRING);
- g_object_get_property(G_OBJECT(ci), PROP_ICON_NAME_S, &value);
- return g_value_get_string(&value);
+ g_return_val_if_fail (IS_APP_INDICATOR (self), NULL);
+
+ return self->priv->icon_name;
}
/**
@@ -847,29 +764,9 @@ app_indicator_get_icon (AppIndicator * ci)
Return value: The current attention icon name.
*/
const gchar *
-app_indicator_get_attention_icon (AppIndicator * ci)
+app_indicator_get_attention_icon (AppIndicator *self)
{
- GValue value = {0};
- g_value_init(&value, G_TYPE_STRING);
- g_object_get_property(G_OBJECT(ci), PROP_ATTENTION_ICON_NAME_S, &value);
- return g_value_get_string(&value);
-}
-
-/**
- app_indicator_get_menu:
- @ci: The #AppIndicator object to use
-
- Wrapper function for property #AppIndicator::menu.
+ g_return_val_if_fail (IS_APP_INDICATOR (self), NULL);
- Return value: The current menu being used.
-*/
-DbusmenuServer *
-app_indicator_get_menu (AppIndicator * ci)
-{
- GValue value = {0};
- g_value_init(&value, G_TYPE_OBJECT);
- g_object_get_property(G_OBJECT(ci), PROP_MENU_OBJECT_S, &value);
- return DBUSMENU_SERVER(g_value_get_object(&value));
+ return self->priv->attention_icon_name;
}
-
-
diff --git a/src/libappindicator/app-indicator.h b/src/libappindicator/app-indicator.h
index f955506..6a961fe 100644
--- a/src/libappindicator/app-indicator.h
+++ b/src/libappindicator/app-indicator.h
@@ -6,32 +6,31 @@ Copyright 2009 Canonical Ltd.
Authors:
Ted Gould <ted@canonical.com>
+ Cody Russell <cody.russell@canonical.com>
-This program is free software: you can redistribute it and/or modify it
+This program is free software: you can redistribute it and/or modify it
under the terms of either or both of the following licenses:
-1) the GNU Lesser General Public License version 3, as published by the
+1) the GNU Lesser General Public License version 3, as published by the
Free Software Foundation; and/or
-2) the GNU Lesser General Public License version 2.1, as published by
+2) the GNU Lesser General Public License version 2.1, 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 applicable version of the GNU Lesser General Public
+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 applicable version of the GNU Lesser General Public
License for more details.
-You should have received a copy of both the GNU Lesser General Public
-License version 3 and version 2.1 along with this program. If not, see
+You should have received a copy of both the GNU Lesser General Public
+License version 3 and version 2.1 along with this program. If not, see
<http://www.gnu.org/licenses/>
*/
#ifndef __APP_INDICATOR_H__
#define __APP_INDICATOR_H__
-#include <glib.h>
-#include <glib-object.h>
-#include <libdbusmenu-glib/server.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
@@ -83,8 +82,9 @@ typedef enum { /*< prefix=APP_INDICATOR_STATUS >*/
APP_INDICATOR_STATUS_ATTENTION
} AppIndicatorStatus;
-typedef struct _AppIndicator AppIndicator;
-typedef struct _AppIndicatorClass AppIndicatorClass;
+typedef struct _AppIndicator AppIndicator;
+typedef struct _AppIndicatorClass AppIndicatorClass;
+typedef struct _AppIndicatorPrivate AppIndicatorPrivate;
/**
AppIndicatorClass:
@@ -106,13 +106,13 @@ struct _AppIndicatorClass {
GObjectClass parent_class;
/* DBus Signals */
- void (* new_icon) (AppIndicator * indicator,
- gpointer user_data);
- void (* new_attention_icon) (AppIndicator * indicator,
- gpointer user_data);
- void (* new_status) (AppIndicator * indicator,
- gchar * status_string,
- gpointer user_data);
+ void (* new_icon) (AppIndicator *indicator,
+ gpointer user_data);
+ void (* new_attention_icon) (AppIndicator *indicator,
+ gpointer user_data);
+ void (* new_status) (AppIndicator *indicator,
+ const gchar *status,
+ gpointer user_data);
/* Local Signals */
void (* connection_changed) (AppIndicator * indicator,
@@ -137,33 +137,33 @@ struct _AppIndicatorClass {
*/
struct _AppIndicator {
GObject parent;
- /* None. We're a very private object. */
+
+ AppIndicatorPrivate *priv;
};
/* GObject Stuff */
-GType app_indicator_get_type (void);
+GType app_indicator_get_type (void) G_GNUC_CONST;
+
+AppIndicator *app_indicator_new (const gchar *id,
+ const gchar *icon_name,
+ AppIndicatorCategory category);
/* Set properties */
-void app_indicator_set_id (AppIndicator * ci,
- const gchar * id);
-void app_indicator_set_category (AppIndicator * ci,
- AppIndicatorCategory category);
-void app_indicator_set_status (AppIndicator * ci,
- AppIndicatorStatus status);
-void app_indicator_set_icon (AppIndicator * ci,
- const gchar * icon_name);
-void app_indicator_set_attention_icon (AppIndicator * ci,
- const gchar * icon_name);
-void app_indicator_set_menu (AppIndicator * ci,
- DbusmenuServer * menu);
+void app_indicator_set_status (AppIndicator *self,
+ AppIndicatorStatus status);
+void app_indicator_set_attention_icon (AppIndicator *self,
+ const gchar *icon_name);
+void app_indicator_set_menu (AppIndicator *self,
+ GtkMenu *menu);
+void app_indicator_set_icon (AppIndicator *self,
+ const gchar *icon_name);
/* Get properties */
-const gchar * app_indicator_get_id (AppIndicator * ci);
-AppIndicatorCategory app_indicator_get_category (AppIndicator * ci);
-AppIndicatorStatus app_indicator_get_status (AppIndicator * ci);
-const gchar * app_indicator_get_icon (AppIndicator * ci);
-const gchar * app_indicator_get_attention_icon (AppIndicator * ci);
-DbusmenuServer * app_indicator_get_menu (AppIndicator * ci);
+const gchar * app_indicator_get_id (AppIndicator *self);
+AppIndicatorCategory app_indicator_get_category (AppIndicator *self);
+AppIndicatorStatus app_indicator_get_status (AppIndicator *self);
+const gchar * app_indicator_get_icon (AppIndicator *self);
+const gchar * app_indicator_get_attention_icon (AppIndicator *self);
G_END_DECLS
diff --git a/tests/test-libappindicator-dbus-client.c b/tests/test-libappindicator-dbus-client.c
index 5b12920..8598f9a 100644
--- a/tests/test-libappindicator-dbus-client.c
+++ b/tests/test-libappindicator-dbus-client.c
@@ -7,16 +7,16 @@ 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
+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
+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
+You should have received a copy of the GNU General Public License along
with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -33,7 +33,7 @@ static int propcount = 0;
static void
check_propcount (void)
{
- if (propcount >= 6) {
+ if (propcount >= 5) {
g_main_loop_quit(mainloop);
}
return;
@@ -175,33 +175,6 @@ prop_attention_icon_name_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * d
return;
}
-static void
-prop_menu_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data)
-{
- propcount++;
-
- GError * error = NULL;
- GValue value = {0};
-
- if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &value, G_TYPE_INVALID)) {
- g_warning("Getting menu object failed: %s", error->message);
- g_error_free(error);
- passed = FALSE;
- check_propcount();
- return;
- }
-
- if (g_strcmp0(TEST_OBJECT, g_value_get_string(&value))) {
- g_debug("Property menu object Returned: FAILED");
- passed = FALSE;
- } else {
- g_debug("Property menu object Returned: PASSED");
- }
-
- check_propcount();
- return;
-}
-
gboolean
kill_func (gpointer userdata)
{
@@ -270,13 +243,6 @@ main (gint argc, gchar * argv[])
G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem",
G_TYPE_STRING, "AttentionIconName",
G_TYPE_INVALID);
- dbus_g_proxy_begin_call (props,
- "Get",
- prop_menu_cb,
- NULL, NULL,
- G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem",
- G_TYPE_STRING, "Menu",
- G_TYPE_INVALID);
g_timeout_add_seconds(2, kill_func, NULL);
diff --git a/tests/test-libappindicator-dbus-server.c b/tests/test-libappindicator-dbus-server.c
index 6216c94..cc072aa 100644
--- a/tests/test-libappindicator-dbus-server.c
+++ b/tests/test-libappindicator-dbus-server.c
@@ -7,16 +7,16 @@ 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
+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
+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
+You should have received a copy of the GNU General Public License along
with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -43,16 +43,9 @@ main (gint argc, gchar * argv[])
g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL))));
- DbusmenuServer * dms = dbusmenu_server_new(TEST_OBJECT);
-
- AppIndicator * ci = APP_INDICATOR(g_object_new(APP_INDICATOR_TYPE,
- "id", TEST_ID,
- "category-enum", TEST_CATEGORY,
- "status-enum", TEST_STATE,
- "icon-name", TEST_ICON_NAME,
- "attention-icon-name", TEST_ATTENTION_ICON_NAME,
- "menu-object", dms,
- NULL));
+ AppIndicator * ci = app_indicator_new (TEST_ID, TEST_ICON_NAME, TEST_CATEGORY);
+ app_indicator_set_status (ci, TEST_STATE);
+ app_indicator_set_attention_icon (ci, TEST_ATTENTION_ICON_NAME);
g_timeout_add_seconds(2, kill_func, NULL);
diff --git a/tests/test-libappindicator.c b/tests/test-libappindicator.c
index 8b76d6e..896782d 100644
--- a/tests/test-libappindicator.c
+++ b/tests/test-libappindicator.c
@@ -42,7 +42,10 @@ test_libappindicator_prop_signals_helper (AppIndicator * ci, gboolean * signalac
void
test_libappindicator_prop_signals (void)
{
- AppIndicator * ci = APP_INDICATOR(g_object_new(APP_INDICATOR_TYPE, NULL));
+ AppIndicator * ci = app_indicator_new ("test-app-indicator",
+ "indicator-messages",
+ APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
+
g_assert(ci != NULL);
gboolean signaled = FALSE;
@@ -109,13 +112,13 @@ test_libappindicator_prop_signals (void)
void
test_libappindicator_init_set_props (void)
{
- AppIndicator * ci = APP_INDICATOR(g_object_new(APP_INDICATOR_TYPE, NULL));
+ AppIndicator * ci = app_indicator_new ("my-id",
+ "my-name",
+ APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
+
g_assert(ci != NULL);
- app_indicator_set_id(ci, "my-id");
- app_indicator_set_category(ci, APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
app_indicator_set_status(ci, APP_INDICATOR_STATUS_ACTIVE);
- app_indicator_set_icon(ci, "my-name");
app_indicator_set_attention_icon(ci, "my-attention-name");
g_assert(!g_strcmp0("my-id", app_indicator_get_id(ci)));
@@ -131,13 +134,13 @@ test_libappindicator_init_set_props (void)
void
test_libappindicator_init_with_props (void)
{
- AppIndicator * ci = APP_INDICATOR(g_object_new(APP_INDICATOR_TYPE,
- "id", "my-id",
- "category-enum", APP_INDICATOR_CATEGORY_APPLICATION_STATUS,
- "status-enum", APP_INDICATOR_STATUS_ACTIVE,
- "icon-name", "my-name",
- "attention-icon-name", "my-attention-name",
- NULL));
+ AppIndicator * ci = app_indicator_new ("my-id",
+ "my-name",
+ APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
+
+ app_indicator_set_status (ci, APP_INDICATOR_STATUS_ACTIVE);
+ app_indicator_set_attention_icon (ci, "my-attention-name");
+
g_assert(ci != NULL);
g_assert(!g_strcmp0("my-id", app_indicator_get_id(ci)));
@@ -153,7 +156,7 @@ test_libappindicator_init_with_props (void)
void
test_libappindicator_init (void)
{
- AppIndicator * ci = APP_INDICATOR(g_object_new(APP_INDICATOR_TYPE, NULL));
+ AppIndicator * ci = app_indicator_new ("my-id", "my-name", APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
g_assert(ci != NULL);
g_object_unref(G_OBJECT(ci));
return;
diff --git a/tests/test-simple-app.c b/tests/test-simple-app.c
index 60ed88f..f5957c8 100644
--- a/tests/test-simple-app.c
+++ b/tests/test-simple-app.c
@@ -23,6 +23,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <glib.h>
+#include <libdbusmenu-glib/server.h>
#include <libappindicator/app-indicator.h>
static GMainLoop * mainloop = NULL;