diff options
| author | Conor Curran <conor.curran@canonical.com> | 2010-09-02 16:31:30 +0100 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2010-09-02 16:31:30 +0100 |
| commit | 966137c8c0547f1c749fa7b13955c6f536539129 (patch) | |
| tree | 877dfb8bfa63e7ea84c04f1c08a29099d3ffd40b | |
| parent | 0c040b86cd7a05c8284662bb3032dccbf6707e90 (diff) | |
| download | ayatana-indicator-sound-966137c8c0547f1c749fa7b13955c6f536539129.tar.gz ayatana-indicator-sound-966137c8c0547f1c749fa7b13955c6f536539129.tar.bz2 ayatana-indicator-sound-966137c8c0547f1c749fa7b13955c6f536539129.zip | |
tidy up
| -rw-r--r-- | src/title-widget.c | 15 | ||||
| -rw-r--r-- | src/title-widget.h | 2 |
2 files changed, 4 insertions, 13 deletions
diff --git a/src/title-widget.c b/src/title-widget.c index 0a59cca..04471c0 100644 --- a/src/title-widget.c +++ b/src/title-widget.c @@ -34,7 +34,6 @@ struct _TitleWidgetPrivate { GtkWidget* hbox; GtkWidget* name; - GtkWidget* player_icon; GtkWidget* image_item; DbusmenuMenuitem* twin_item; }; @@ -88,7 +87,7 @@ title_widget_init (TitleWidget *self) hbox = gtk_hbox_new(FALSE, 0); priv->hbox = hbox; - // Add image to the 'gutter' + // Add image to the 'gutter' gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(self), TRUE); gint padding = 4; @@ -97,7 +96,6 @@ title_widget_init (TitleWidget *self) gint width, height; gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height); - //priv->player_icon = indicator_image_helper("sound_icon"); GtkWidget * icon = gtk_image_new_from_icon_name("sound_icon", GTK_ICON_SIZE_MENU); gtk_widget_set_size_request(icon, width @@ -107,12 +105,11 @@ title_widget_init (TitleWidget *self) gtk_misc_set_alignment(GTK_MISC(icon), 1.0 /* right aligned */, 0.5); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(self), icon); gtk_widget_show(icon); - + gtk_widget_show(GTK_WIDGET(self)); + GtkImageType type = gtk_image_get_storage_type(GTK_IMAGE(icon)); g_debug("gtk_image_storage_type = %i", type); - //gtk_container_add(GTK_CONTAINER(gmi), priv->hbox); - //gtk_box_pack_start(GTK_BOX (priv->hbox), priv->image_item, FALSE, FALSE, 0); } static void @@ -190,12 +187,6 @@ title_widget_style_name_text(TitleWidget* self) g_free(markup); } -GtkWidget* title_widget_get_player_icon(TitleWidget* self) -{ - TitleWidgetPrivate * priv = TITLE_WIDGET_GET_PRIVATE(self); - return priv->player_icon; -} - /** * transport_new: * @returns: a new #TitleWidget. diff --git a/src/title-widget.h b/src/title-widget.h index 3e3ada8..574a2b1 100644 --- a/src/title-widget.h +++ b/src/title-widget.h @@ -44,7 +44,7 @@ struct _TitleWidget { GType title_widget_get_type (void); GtkWidget* title_widget_new(DbusmenuMenuitem *twin_item); -GtkWidget* title_widget_get_player_icon(TitleWidget* self); + G_END_DECLS #endif |