[network-manager-applet/dcbw/indicator-cleanups: 3/3] applet: don't use GtkImageMenuItems (bgo #740574)
- From: Dan Williams <dcbw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/dcbw/indicator-cleanups: 3/3] applet: don't use GtkImageMenuItems (bgo #740574)
- Date: Mon, 22 Feb 2016 21:16:44 +0000 (UTC)
commit e75ae3d80ee386425a26ddb0eb8eb35970a1a7b0
Author: Dan Williams <dcbw redhat com>
Date: Mon Feb 22 14:34:26 2016 -0600
applet: don't use GtkImageMenuItems (bgo #740574)
GtkImageMenuItems are deprecated and we shouldn't use them anymore.
So don't; appindicator/dbusmenu can handle GtkImages in normal
GtkMenuItems after these patches are applied:
https://code.launchpad.net/~dcbw/libdbusmenu/libdbusmenu/+merge/286843
appindicator/dbusmenu also strips Pango markup so we can remove
the conditionals around label text.
src/ap-menu-item.c | 26 +++-----------------------
src/ap-menu-item.h | 4 ++--
src/mb-menu-item.c | 24 +-----------------------
src/mb-menu-item.h | 4 ++--
4 files changed, 8 insertions(+), 50 deletions(-)
---
diff --git a/src/ap-menu-item.c b/src/ap-menu-item.c
index e80ad3a..1c576e5 100644
--- a/src/ap-menu-item.c
+++ b/src/ap-menu-item.c
@@ -36,18 +36,16 @@
#include "mobile-helpers.h"
-G_DEFINE_TYPE (NMNetworkMenuItem, nm_network_menu_item, GTK_TYPE_IMAGE_MENU_ITEM);
+G_DEFINE_TYPE (NMNetworkMenuItem, nm_network_menu_item, GTK_TYPE_MENU_ITEM);
#define NM_NETWORK_MENU_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_NETWORK_MENU_ITEM,
NMNetworkMenuItemPrivate))
typedef struct {
-#ifndef ENABLE_INDICATOR
GtkWidget * ssid;
GtkWidget * strength;
GtkWidget * hbox;
-#endif
- char * ssid_string;
+ char * ssid_string;
guint32 int_strength;
gchar * hash;
GSList * dupes;
@@ -128,18 +126,8 @@ update_icon (NMNetworkMenuItem *item, NMApplet *applet)
icon = scaled;
}
-#ifdef ENABLE_INDICATOR
-#ifdef DBUSMENU_PIXMAP_SUPPORT
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), gtk_image_new_from_pixbuf (icon));
-#else
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
- gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU));
-#endif
- /* For some reason we must always re-set always-show after setting the image */
- gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
-#else
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->strength), icon);
-#endif
+
g_object_unref (icon);
}
@@ -195,9 +183,6 @@ update_label (NMNetworkMenuItem *item, gboolean use_bold)
{
NMNetworkMenuItemPrivate *priv = NM_NETWORK_MENU_ITEM_GET_PRIVATE (item);
-#ifdef ENABLE_INDICATOR
- gtk_menu_item_set_label (GTK_MENU_ITEM (item), priv->ssid_string);
-#else
gtk_label_set_use_markup (GTK_LABEL (priv->ssid), use_bold);
if (use_bold) {
char *markup = g_markup_printf_escaped ("<b>%s</b>", priv->ssid_string);
@@ -206,7 +191,6 @@ update_label (NMNetworkMenuItem *item, gboolean use_bold)
g_free (markup);
} else
gtk_label_set_text (GTK_LABEL (priv->ssid), priv->ssid_string);
-#endif
}
void
@@ -319,7 +303,6 @@ nm_network_menu_item_new (NMAccessPoint *ap,
static void
nm_network_menu_item_init (NMNetworkMenuItem *item)
{
-#ifndef ENABLE_INDICATOR
NMNetworkMenuItemPrivate *priv = NM_NETWORK_MENU_ITEM_GET_PRIVATE (item);
priv->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
@@ -335,9 +318,6 @@ nm_network_menu_item_init (NMNetworkMenuItem *item)
gtk_widget_show (priv->ssid);
gtk_widget_show (priv->hbox);
-#else
- gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
-#endif
}
static void
diff --git a/src/ap-menu-item.h b/src/ap-menu-item.h
index c538c36..2136a8f 100644
--- a/src/ap-menu-item.h
+++ b/src/ap-menu-item.h
@@ -40,11 +40,11 @@ typedef struct _NMNetworkMenuItem NMNetworkMenuItem;
typedef struct _NMNetworkMenuItemClass NMNetworkMenuItemClass;
struct _NMNetworkMenuItem {
- GtkImageMenuItem parent;
+ GtkMenuItem parent;
};
struct _NMNetworkMenuItemClass {
- GtkImageMenuItemClass parent_class;
+ GtkMenuItemClass parent_class;
};
diff --git a/src/mb-menu-item.c b/src/mb-menu-item.c
index 5fbe383..0c9bbc5 100644
--- a/src/mb-menu-item.c
+++ b/src/mb-menu-item.c
@@ -31,17 +31,15 @@
#include "mb-menu-item.h"
-G_DEFINE_TYPE (NMMbMenuItem, nm_mb_menu_item, GTK_TYPE_IMAGE_MENU_ITEM);
+G_DEFINE_TYPE (NMMbMenuItem, nm_mb_menu_item, GTK_TYPE_MENU_ITEM);
#define NM_MB_MENU_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_MB_MENU_ITEM,
NMMbMenuItemPrivate))
typedef struct {
-#ifndef ENABLE_INDICATOR
GtkWidget *strength;
GtkWidget *detail;
GtkWidget *hbox;
GtkWidget *desc;
-#endif
char *desc_string;
guint32 int_strength;
@@ -83,9 +81,6 @@ update_label (NMMbMenuItem *item, gboolean use_bold)
{
NMMbMenuItemPrivate *priv = NM_MB_MENU_ITEM_GET_PRIVATE (item);
-#ifdef ENABLE_INDICATOR
- gtk_menu_item_set_label (GTK_MENU_ITEM (item), priv->desc_string);
-#else
gtk_label_set_use_markup (GTK_LABEL (priv->desc), use_bold);
if (use_bold) {
char *markup = g_markup_printf_escaped ("<b>%s</b>", priv->desc_string);
@@ -94,7 +89,6 @@ update_label (NMMbMenuItem *item, gboolean use_bold)
g_free (markup);
} else
gtk_label_set_text (GTK_LABEL (priv->desc), priv->desc_string);
-#endif
}
GtkWidget *
@@ -191,19 +185,7 @@ nm_mb_menu_item_new (const char *connection_name,
const char *icon_name = mobile_helper_get_quality_icon_name (strength);
GdkPixbuf *pixbuf = nma_icon_check_and_load (icon_name, applet);
-#ifdef ENABLE_INDICATOR
-#ifdef DBUSMENU_PIXMAP_SUPPORT
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), gtk_image_new_from_pixbuf
(pixbuf));
-#else
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
- gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU));
- pixbuf = NULL;
-#endif
- /* For some reason we must always re-set always-show after setting the image */
- gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
-#else
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->strength), pixbuf);
-#endif
}
return GTK_WIDGET (item);
@@ -214,7 +196,6 @@ nm_mb_menu_item_new (const char *connection_name,
static void
nm_mb_menu_item_init (NMMbMenuItem *self)
{
-#ifndef ENABLE_INDICATOR
NMMbMenuItemPrivate *priv = NM_MB_MENU_ITEM_GET_PRIVATE (self);
priv->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
@@ -230,9 +211,6 @@ nm_mb_menu_item_init (NMMbMenuItem *self)
gtk_widget_show (priv->desc);
gtk_widget_show (priv->strength);
gtk_widget_show (priv->hbox);
-#else
- gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (self), TRUE);
-#endif
}
static void
diff --git a/src/mb-menu-item.h b/src/mb-menu-item.h
index e38ed9f..a973062 100644
--- a/src/mb-menu-item.h
+++ b/src/mb-menu-item.h
@@ -36,11 +36,11 @@
#define NM_MB_MENU_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_MB_MENU_ITEM,
NMMbMenuItemClass))
typedef struct {
- GtkImageMenuItem image_item;
+ GtkMenuItem image_item;
} NMMbMenuItem;
typedef struct {
- GtkImageMenuItemClass parent_class;
+ GtkMenuItemClass parent_class;
} NMMbMenuItemClass;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]