aboutsummaryrefslogtreecommitdiff
path: root/src/title-menu-item.c
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2011-01-11 10:44:40 -0600
committerBazaar Package Importer <james.westby@ubuntu.com>2011-01-11 10:44:40 -0600
commitcb6ca63e62511e9107eea459a5a705b713416e7e (patch)
treea477ffb0c58de4d2358fa75352c87773f7c2f245 /src/title-menu-item.c
parent9caa6a3807dd44f8345266f1f341b4a5d02a8d96 (diff)
parentf4f168553cc7fc9ed09f76c805694abfcad70870 (diff)
downloadayatana-indicator-sound-cb6ca63e62511e9107eea459a5a705b713416e7e.tar.gz
ayatana-indicator-sound-cb6ca63e62511e9107eea459a5a705b713416e7e.tar.bz2
ayatana-indicator-sound-cb6ca63e62511e9107eea459a5a705b713416e7e.zip
* New upstream release.
- unity-panel-service crashed with SIGSEGV in cairo_translate (LP: #683184) - Add MPRIS Playlist support (LP: #692644) - only first word of application name is shown (LP: #695385) - The players list should be customizable (LP: #685725) - gio-unix-2.0 checks (LP: #694828) - Desktop file loading should not manually use full path (LP: #693824) - Banshee mpris interface crashes (LP: #701692) * debian/control - Added build depends for libxml2-dev
Diffstat (limited to 'src/title-menu-item.c')
-rw-r--r--src/title-menu-item.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/title-menu-item.c b/src/title-menu-item.c
index 5e4ee1c..d8130a0 100644
--- a/src/title-menu-item.c
+++ b/src/title-menu-item.c
@@ -1,4 +1,4 @@
-/* title-menu-item.c generated by valac 0.11.2, the Vala compiler
+/* title-menu-item.c generated by valac 0.11.3, the Vala compiler
* generated from title-menu-item.vala, do not modify */
/*
@@ -27,6 +27,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include <libdbusmenu-glib/menuitem.h>
#include <libdbusmenu-glib/server.h>
#include <common-defs.h>
+#include <gio/gio.h>
#include <stdlib.h>
#include <string.h>
#include <gee.h>
@@ -102,6 +103,7 @@ struct _PlayerController {
gint current_state;
GeeArrayList* custom_items;
Mpris2Controller* mpris_bridge;
+ gboolean* use_playlists;
};
struct _PlayerControllerClass {
@@ -127,7 +129,7 @@ enum {
GType player_controller_get_type (void) G_GNUC_CONST;
TitleMenuitem* title_menuitem_new (PlayerController* parent);
TitleMenuitem* title_menuitem_construct (GType object_type, PlayerController* parent);
-const gchar* player_controller_get_name (PlayerController* self);
+GAppInfo* player_controller_get_app_info (PlayerController* self);
const gchar* player_controller_get_icon_name (PlayerController* self);
static void title_menuitem_real_handle_event (DbusmenuMenuitem* base, const gchar* name, GValue* input_value, guint timestamp);
PlayerController* player_item_get_owner (PlayerItem* self);
@@ -141,15 +143,14 @@ GeeHashSet* title_menuitem_attributes_format (void);
TitleMenuitem* title_menuitem_construct (GType object_type, PlayerController* parent) {
TitleMenuitem * self = NULL;
- const gchar* _tmp0_ = NULL;
+ GAppInfo* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
const gchar* _tmp2_ = NULL;
g_return_val_if_fail (parent != NULL, NULL);
self = (TitleMenuitem*) g_object_new (object_type, "item-type", DBUSMENU_TITLE_MENUITEM_TYPE, "owner", parent, NULL);
- _tmp0_ = player_controller_get_name (parent);
- dbusmenu_menuitem_property_set ((DbusmenuMenuitem*) self, DBUSMENU_TITLE_MENUITEM_NAME, _tmp0_);
- _tmp1_ = player_controller_get_icon_name (parent);
- g_debug ("title-menu-item.vala:30: title init - icon name = %s", _tmp1_);
+ _tmp0_ = player_controller_get_app_info (parent);
+ _tmp1_ = g_app_info_get_name (_tmp0_);
+ dbusmenu_menuitem_property_set ((DbusmenuMenuitem*) self, DBUSMENU_TITLE_MENUITEM_NAME, _tmp1_);
_tmp2_ = player_controller_get_icon_name (parent);
dbusmenu_menuitem_property_set ((DbusmenuMenuitem*) self, DBUSMENU_TITLE_MENUITEM_ICON, _tmp2_);
dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) self, DBUSMENU_TITLE_MENUITEM_RUNNING, FALSE);