diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2012-02-14 19:41:28 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2012-02-14 19:41:28 +0100 |
| commit | f869dde973a34bd1a148cca008639c3b3ae19292 (patch) | |
| tree | 6de41b911d1a0fd2b9b5150f351174c36a4b8808 /src/metadata-widget.c | |
| parent | 46ce85550e1349998561f82146a3828cc94e311e (diff) | |
| parent | 302256286a5e443a67592b7addd02c0633531cfc (diff) | |
| download | ayatana-indicator-sound-f869dde973a34bd1a148cca008639c3b3ae19292.tar.gz ayatana-indicator-sound-f869dde973a34bd1a148cca008639c3b3ae19292.tar.bz2 ayatana-indicator-sound-f869dde973a34bd1a148cca008639c3b3ae19292.zip | |
* New upstream release.
- No easy way to turn the sound menu on/off (lp: #829648)
- Avoid spawning notification daemon at startup (lp: #912150)
- Creation of album-art-cache folder (lp: #799383)
- schema id & path are inconsistent with other indicators (lp: #914377)
Diffstat (limited to 'src/metadata-widget.c')
| -rw-r--r-- | src/metadata-widget.c | 42 |
1 files changed, 36 insertions, 6 deletions
diff --git a/src/metadata-widget.c b/src/metadata-widget.c index 96d55ab..a3383df 100644 --- a/src/metadata-widget.c +++ b/src/metadata-widget.c @@ -127,9 +127,19 @@ metadata_widget_init (MetadataWidget *self) GtkWidget *hbox; GtkWidget *outer_v_box; priv->icon_buf = NULL; - - outer_v_box = gtk_vbox_new (FALSE, 0); + + #if GTK_CHECK_VERSION(3, 0, 0) + outer_v_box = gtk_box_new (FALSE, 0); + #else + outer_v_box = gtk_vbox_new (FALSE, 0); + #endif + + #if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_box_new(FALSE, 0); + #else hbox = gtk_hbox_new(FALSE, 0); + #endif + priv->meta_data_h_box = hbox; priv->current_height = 1; @@ -162,7 +172,13 @@ metadata_widget_init (MetadataWidget *self) FALSE, 1); priv->theme_change_occured = FALSE; + + #if GTK_CHECK_VERSION(3, 0, 0) + GtkWidget* vbox = gtk_box_new(FALSE, 0); + #else GtkWidget* vbox = gtk_vbox_new(FALSE, 0); + #endif + // artist GtkWidget* artist; @@ -235,7 +251,12 @@ metadata_widget_dispose (GObject *object) MetadataWidgetPrivate * priv = METADATA_WIDGET_GET_PRIVATE(METADATA_WIDGET(object)); if (priv->icon_buf != NULL){ - gdk_pixbuf_unref(priv->icon_buf); + #if GTK_CHECK_VERSION(3, 0, 0) + g_object_unref(priv->icon_buf); + #else + gdk_pixbuf_unref(priv->icon_buf); + #endif + priv->icon_buf = NULL; } G_OBJECT_CLASS (metadata_widget_parent_class)->dispose (object); } @@ -243,6 +264,10 @@ metadata_widget_dispose (GObject *object) static void metadata_widget_finalize (GObject *object) { + MetadataWidgetPrivate * priv = METADATA_WIDGET_GET_PRIVATE(METADATA_WIDGET(object)); + g_string_free (priv->image_path, TRUE); + g_string_free (priv->old_image_path, TRUE); + G_OBJECT_CLASS (metadata_widget_parent_class)->finalize (object); } @@ -756,7 +781,11 @@ metadata_widget_set_icon (MetadataWidget *self) MetadataWidgetPrivate * priv = METADATA_WIDGET_GET_PRIVATE(self); if (priv->icon_buf != NULL){ - gdk_pixbuf_unref(priv->icon_buf); + #if GTK_CHECK_VERSION(3, 0, 0) + g_object_unref(priv->icon_buf); + #else + gdk_pixbuf_unref(priv->icon_buf); + #endif priv->icon_buf = NULL; } @@ -766,8 +795,9 @@ metadata_widget_set_icon (MetadataWidget *self) gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &width, &height); GString* banshee_string = g_string_new ( "banshee" ); - GString* app_panel = g_string_new ( g_utf8_strdown (dbusmenu_menuitem_property_get(priv->twin_item, DBUSMENU_METADATA_MENUITEM_PLAYER_NAME), - -1)); + gchar * tmp = g_utf8_strdown (dbusmenu_menuitem_property_get(priv->twin_item, DBUSMENU_METADATA_MENUITEM_PLAYER_NAME), -1); + GString* app_panel = g_string_new (tmp); + g_free (tmp); GdkPixbuf* icon_buf; // Banshee Special case! |