aboutsummaryrefslogtreecommitdiff
path: root/src/app-indicator.c
diff options
context:
space:
mode:
authorMichael Terry <mike@mterry.name>2010-10-06 12:08:49 -0400
committerMichael Terry <mike@mterry.name>2010-10-06 12:08:49 -0400
commit3551eb170dd87fbe11148136813e1bb580b90604 (patch)
tree4655d23dedc302e6660261950d412753b3c14f78 /src/app-indicator.c
parent60abdc2090b0a77e98011b4952bfad396db57626 (diff)
downloadlibayatana-appindicator-3551eb170dd87fbe11148136813e1bb580b90604.tar.gz
libayatana-appindicator-3551eb170dd87fbe11148136813e1bb580b90604.tar.bz2
libayatana-appindicator-3551eb170dd87fbe11148136813e1bb580b90604.zip
instead of always building gtk2 and gtk3, add a --with-gtk= flag to configure to specify which to build with
Diffstat (limited to 'src/app-indicator.c')
-rw-r--r--src/app-indicator.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/app-indicator.c b/src/app-indicator.c
index 939ca9a..a52a063 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -33,7 +33,11 @@ License version 3 and version 2.1 along with this program. If not, see
#include <dbus/dbus-glib.h>
#include <libdbusmenu-glib/server.h>
+#ifdef HAVE_GTK3
+#include <libdbusmenu-gtk3/client.h>
+#else
#include <libdbusmenu-gtk/client.h>
+#endif
#include "app-indicator.h"
#include "app-indicator-enum-types.h"
@@ -1194,13 +1198,17 @@ static void
update_icon_name (DbusmenuMenuitem *menuitem,
GtkImage *image)
{
+ const gchar *icon_name = NULL;
+
if (gtk_image_get_storage_type (image) != GTK_IMAGE_ICON_NAME)
return;
+ gtk_image_get_icon_name (image, &icon_name, NULL);
+
if (should_show_image (image))
dbusmenu_menuitem_property_set (menuitem,
DBUSMENU_MENUITEM_PROP_ICON_NAME,
- image->data.name.icon_name);
+ icon_name);
else
dbusmenu_menuitem_property_remove (menuitem,
DBUSMENU_MENUITEM_PROP_ICON_NAME);
@@ -1212,16 +1220,18 @@ update_stock_item (DbusmenuMenuitem *menuitem,
GtkImage *image)
{
GtkStockItem stock;
+ gchar *stock_id = NULL;
if (gtk_image_get_storage_type (image) != GTK_IMAGE_STOCK)
return FALSE;
- gtk_stock_lookup (image->data.stock.stock_id, &stock);
+ gtk_image_get_stock (image, &stock_id, NULL);
+ gtk_stock_lookup (stock_id, &stock);
if (should_show_image (image))
dbusmenu_menuitem_property_set (menuitem,
DBUSMENU_MENUITEM_PROP_ICON_NAME,
- image->data.stock.stock_id);
+ stock_id);
else
dbusmenu_menuitem_property_remove (menuitem,
DBUSMENU_MENUITEM_PROP_ICON_NAME);