and the actual rename

2 files changed, 0 insertions, 229 deletions

diff --git a/src/metadata-widget.c~ b/src/metadata-widget.c~
deleted file mode 100644
index add3c36..0000000
--- a/src/metadata-widget.c~
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-Copyright 2010 Canonical Ltd.
-
-Authors:
-    Conor Curran <conor.curran@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 
-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 GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <glib/gi18n.h>
-#include "metadata-widget.h"
-#include "common-defs.h"
-#include <gtk/gtk.h>
-
-static DbusmenuMenuitem* twin_item;
-
-typedef struct _MetadataWidgetPrivate MetadataWidgetPrivate;
-
-struct _MetadataWidgetPrivate
-{
-	GtkWidget* hbox;
-	GtkWidget* album_art;
-  gchar* 		 our_path;
-	GtkWidget* artist_label;
-	GtkWidget* piece_label;
-	GtkWidget* container_label;	
-};
-
-#define METADATA_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), METADATA_WIDGET_TYPE, MetadataWidgetPrivate))
-
-/* Prototypes */
-static void metadata_widget_class_init (MetadataWidgetClass *klass);
-static void metadata_widget_init       (MetadataWidget *self);
-static void metadata_widget_dispose    (GObject *object);
-static void metadata_widget_finalize   (GObject *object);
-// keyevent consumers
-static gboolean metadata_widget_button_press_event (GtkWidget *menuitem, 
-                                  									GdkEventButton *event);
-static gboolean metadata_widget_button_release_event (GtkWidget *menuitem, 
-                                  										GdkEventButton *event);
-// Dbusmenuitem properties update callback
-static void metadata_widget_update_state(gchar * property, 
-                                       GValue * value,
-                                       gpointer userdata);
-//static void update_content( 
-
-
-G_DEFINE_TYPE (MetadataWidget, metadata_widget, GTK_TYPE_MENU_ITEM);
-
-
-
-static void
-metadata_widget_class_init (MetadataWidgetClass *klass)
-{
-	GObjectClass 			*gobject_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass    *widget_class = GTK_WIDGET_CLASS (klass);
-
-	widget_class->button_press_event = metadata_widget_button_press_event;
-  widget_class->button_release_event = metadata_widget_button_release_event;
-	
-	g_type_class_add_private (klass, sizeof (MetadataWidgetPrivate));
-
-	gobject_class->dispose = metadata_widget_dispose;
-	gobject_class->finalize = metadata_widget_finalize;
-
-}
-
-static void
-metadata_widget_init (MetadataWidget *self)
-{
-	g_debug("MetadataWidget::metadata_widget_init");
-
-	MetadataWidgetPrivate * priv = METADATA_WIDGET_GET_PRIVATE(self);
-
-	GtkWidget *hbox;
-
-	hbox = gtk_hbox_new(TRUE, 0);
-	priv->hbox = hbox;
-	
-	// image
-	const gchar* path = dbusmenu_menuitem_property_get(twin_item, DBUSMENU_METADATA_MENUITEM_IMAGE_PATH);
-	g_debug("MetadataWidget:init - path = %s", path);
-	priv->our_path = g_strdup(path);
-	GdkPixbuf* pixbuf;
-	pixbuf=gdk_pixbuf_new_from_file(path, NULL);
-  pixbuf=gdk_pixbuf_scale_simple(pixbuf,60,60,GDK_INTERP_BILINEAR);
-	priv->album_art = gtk_image_new_from_pixbuf(pixbuf);
-	g_object_unref(pixbuf);
-	gtk_box_pack_start (GTK_BOX (priv->hbox), priv->album_art, FALSE, FALSE, 0);	
-	GtkWidget* vbox = gtk_vbox_new(TRUE, 0);
-
-	// artist
-	GtkWidget* artist;
-	artist = gtk_label_new(dbusmenu_menuitem_property_get(twin_item, DBUSMENU_METADATA_MENUITEM_TEXT_ARTIST));
-	priv->artist_label = artist;
-	gtk_box_pack_start (GTK_BOX (vbox), priv->artist_label, FALSE, FALSE, 0);	
-
-	
-	// piece
-	GtkWidget* piece;
-	piece = gtk_label_new(dbusmenu_menuitem_property_get(twin_item, DBUSMENU_METADATA_MENUITEM_TEXT_PIECE));
-	priv->piece_label =  piece;
-	gtk_box_pack_start (GTK_BOX (vbox), priv->piece_label, FALSE, FALSE, 0);	
-	
-	// container
-	GtkWidget* container;
-	container = gtk_label_new(dbusmenu_menuitem_property_get(twin_item, DBUSMENU_METADATA_MENUITEM_TEXT_CONTAINER));
-	priv->container_label = container;
-	gtk_box_pack_start (GTK_BOX (vbox), priv->container_label, FALSE, FALSE, 0);	
-	
-	gtk_box_pack_start (GTK_BOX (priv->hbox), vbox, FALSE, FALSE, 0);	
-
-	g_signal_connect(G_OBJECT(twin_item), "property-changed", 
-	                 G_CALLBACK(metadata_widget_update_state), self);
-	gtk_widget_show_all (priv->hbox);
-  gtk_container_add (GTK_CONTAINER (self), hbox);
-	
-}
-
-static void
-metadata_widget_dispose (GObject *object)
-{
-	G_OBJECT_CLASS (metadata_widget_parent_class)->dispose (object);
-}
-
-static void
-metadata_widget_finalize (GObject *object)
-{
-	G_OBJECT_CLASS (metadata_widget_parent_class)->finalize (object);
-}
-
-/* Suppress/consume keyevents */
-static gboolean
-metadata_widget_button_press_event (GtkWidget *menuitem, 
-                                  GdkEventButton *event)
-{
-	g_debug("MetadataWidget::menu_press_event");
-	return TRUE;
-}
-
-static gboolean
-metadata_widget_button_release_event (GtkWidget *menuitem, 
-                                  GdkEventButton *event)
-{
-	g_debug("MetadataWidget::menu_release_event");
-	return TRUE;
-}
-
-static void metadata_widget_update_state(gchar *property, GValue *value, gpointer userdata)
-{
-	g_debug("metadata_widget_update_state - with property  %s", property);  
-}
-
- /**
- * transport_new:
- * @returns: a new #MetadataWidget.
- **/
-GtkWidget* 
-metadata_widget_new(DbusmenuMenuitem *item)
-{
-	twin_item = item;
-	return g_object_new(METADATA_WIDGET_TYPE, NULL);
-}
-
diff --git a/src/metadata-widget.h~ b/src/metadata-widget.h~
deleted file mode 100644
index edffdf2..0000000
--- a/src/metadata-widget.h~
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2010 Canonical Ltd.
-
-Authors:
-    Conor Curran <conor.curran@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 
-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 GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __METADATA_WIDGET_H__
-#define __METADATA_WIDGET_H__
-
-#include <gtk/gtkmenuitem.h>
-#include <libdbusmenu-gtk/menu.h>
-
-G_BEGIN_DECLS
-
-#define METADATA_WIDGET_TYPE            (metadata_widget_get_type ())
-#define METADATA_WIDGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), METADATA_WIDGET_TYPE, TransportBar))
-#define METADATA_WIDGET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), METADATA_WIDGET_TYPE, TransportBarClass))
-#define IS_METADATA_WIDGET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), METADATA_WIDGET_TYPE))
-#define IS_METADATA_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), METADATA_WIDGET_TYPE))
-#define METADATA_WIDGET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), METADATA_WIDGET_TYPE, TransportBarClass))
-
-typedef struct _TransportBar      TransportBar;
-typedef struct _TransportBarClass TransportBarClass;
-
-struct _TransportBarClass {
-	  GtkMenuItemClass parent_class;
-};
-
-struct _TransportBar {
-	  GtkMenuItem parent;
-};
-
-GType metadata_widget_get_type (void);
-GtkWidget* metadata_widget_new(DbusmenuMenuitem *twin_item);
-
-G_END_DECLS
-
-#endif
-