diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/app-gtk-menu-item.c | 57 | ||||
| -rw-r--r-- | src/app-gtk-menu-item.h | 32 | ||||
| -rw-r--r-- | src/indicator-messages.c | 2 |
5 files changed, 9 insertions, 92 deletions
diff --git a/debian/changelog b/debian/changelog index 0972fa0..0397bdc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-messages (0.3.4-0ubuntu1~ppa2~running2) UNRELEASED; urgency=low + + * Upstream merge + * Fixing label + * Removing unused files + + -- Ted Gould <ted@ubuntu.com> Tue, 23 Mar 2010 16:23:20 -0500 + indicator-messages (0.3.4-0ubuntu1~ppa2~running1) lucid; urgency=low * Upstream merge diff --git a/src/Makefile.am b/src/Makefile.am index 32f0b38..c96ef2d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,8 +8,6 @@ libexec_PROGRAMS = indicator-messages-service messaginglibdir = $(INDICATORDIR) messaginglib_LTLIBRARIES = libmessaging.la libmessaging_la_SOURCES = \ - app-gtk-menu-item.h \ - app-gtk-menu-item.c \ indicator-messages.c \ messages-service-client.h \ dbus-data.h diff --git a/src/app-gtk-menu-item.c b/src/app-gtk-menu-item.c deleted file mode 100644 index 9a34f16..0000000 --- a/src/app-gtk-menu-item.c +++ /dev/null @@ -1,57 +0,0 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "app-gtk-menu-item.h" - -typedef struct _AppGtkMenuItemPrivate AppGtkMenuItemPrivate; -struct _AppGtkMenuItemPrivate { - int dummy; -}; - -#define APP_GTK_MENU_ITEM_GET_PRIVATE(o) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((o), APP_GTK_MENU_ITEM_TYPE, AppGtkMenuItemPrivate)) - -static void app_gtk_menu_item_class_init (AppGtkMenuItemClass *klass); -static void app_gtk_menu_item_init (AppGtkMenuItem *self); -static void app_gtk_menu_item_dispose (GObject *object); -static void app_gtk_menu_item_finalize (GObject *object); - -G_DEFINE_TYPE (AppGtkMenuItem, app_gtk_menu_item, GTK_TYPE_CHECK_MENU_ITEM); - -static void -app_gtk_menu_item_class_init (AppGtkMenuItemClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (klass, sizeof (AppGtkMenuItemPrivate)); - - object_class->dispose = app_gtk_menu_item_dispose; - object_class->finalize = app_gtk_menu_item_finalize; - - return; -} - -static void -app_gtk_menu_item_init (AppGtkMenuItem *self) -{ - - return; -} - -static void -app_gtk_menu_item_dispose (GObject *object) -{ - - G_OBJECT_CLASS (app_gtk_menu_item_parent_class)->dispose (object); - return; -} - -static void -app_gtk_menu_item_finalize (GObject *object) -{ - - - G_OBJECT_CLASS (app_gtk_menu_item_parent_class)->finalize (object); - return; -} diff --git a/src/app-gtk-menu-item.h b/src/app-gtk-menu-item.h deleted file mode 100644 index feb3139..0000000 --- a/src/app-gtk-menu-item.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef __APP_GTK_MENU_ITEM_H__ -#define __APP_GTK_MENU_ITEM_H__ - -#include <glib.h> -#include <glib-object.h> -#include <gtk/gtk.h> - -G_BEGIN_DECLS - -#define APP_GTK_MENU_ITEM_TYPE (app_gtk_menu_item_get_type ()) -#define APP_GTK_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), APP_GTK_MENU_ITEM_TYPE, AppGtkMenuItem)) -#define APP_GTK_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), APP_GTK_MENU_ITEM_TYPE, AppGtkMenuItemClass)) -#define IS_APP_GTK_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), APP_GTK_MENU_ITEM_TYPE)) -#define IS_APP_GTK_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), APP_GTK_MENU_ITEM_TYPE)) -#define APP_GTK_MENU_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), APP_GTK_MENU_ITEM_TYPE, AppGtkMenuItemClass)) - -typedef struct _AppGtkMenuItem AppGtkMenuItem; -typedef struct _AppGtkMenuItemClass AppGtkMenuItemClass; - -struct _AppGtkMenuItemClass { - GtkCheckMenuItemClass parent_class; -}; - -struct _AppGtkMenuItem { - GtkCheckMenuItem parent; -}; - -GType app_gtk_menu_item_get_type (void); - -G_END_DECLS - -#endif diff --git a/src/indicator-messages.c b/src/indicator-messages.c index 2387be4..99e303b 100644 --- a/src/indicator-messages.c +++ b/src/indicator-messages.c @@ -244,7 +244,7 @@ new_application_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbu gtk_widget_show(icon); /* Application name in a label */ - GtkWidget * label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_LABEL)); + GtkWidget * label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME)); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, padding); gtk_widget_show(label); |