From 76406c4e1590a739f592e336cfa2816bd8ae6f4d Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Thu, 16 Jun 2011 16:06:11 +0200
Subject: reverted the metadata widget to inherit from plain old gtk menu item,
 we don't need it to inherit from gtkimagemenuitem anymore

---
 src/metadata-widget.c | 3 +--
 src/metadata-widget.h | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/metadata-widget.c b/src/metadata-widget.c
index aea6f2e..71af85d 100644
--- a/src/metadata-widget.c
+++ b/src/metadata-widget.c
@@ -44,7 +44,6 @@ struct _MetadataWidgetPrivate
   GtkWidget* piece_label;
   GtkWidget* container_label;
   GtkWidget* player_label;
-  GtkWidget* player_icon;
   GdkPixbuf* icon_buf;
   DbusmenuMenuitem* twin_item;
 };
@@ -87,7 +86,7 @@ static void metadata_widget_set_icon (MetadataWidget *self);
 static void metadata_widget_handle_resizing (MetadataWidget* self);
 
 
-G_DEFINE_TYPE (MetadataWidget, metadata_widget, GTK_TYPE_IMAGE_MENU_ITEM);
+G_DEFINE_TYPE (MetadataWidget, metadata_widget, GTK_TYPE_MENU_ITEM);
 
 static void
 metadata_widget_class_init (MetadataWidgetClass *klass)
diff --git a/src/metadata-widget.h b/src/metadata-widget.h
index 48dc61e..30b629c 100644
--- a/src/metadata-widget.h
+++ b/src/metadata-widget.h
@@ -19,8 +19,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef __METADATA_WIDGET_H__
 #define __METADATA_WIDGET_H__
 
-//#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
+#include <gtk/gtkmenuitem.h>
 #include <libdbusmenu-gtk/menuitem.h>
 
 G_BEGIN_DECLS
@@ -36,11 +35,11 @@ typedef struct _MetadataWidget      MetadataWidget;
 typedef struct _MetadataWidgetClass MetadataWidgetClass;
 
 struct _MetadataWidgetClass {
-  GtkImageMenuItemClass parent_class;
+  GtkMenuItemClass parent_class;
 };
 
 struct _MetadataWidget {
-  GtkImageMenuItem parent;
+  GtkMenuItem parent;
 };
 
 GType metadata_widget_get_type (void);
-- 
cgit v1.2.3