Merge lp:~mterry/indicator-sound/add-greeter-mode into lp:indicator-sound/fourth

[Michael Terry]

When in a greeter, use a simpler interface. See bug 811853 for more.

[Conor Curran (cjcurran)]

review: Approve

=== modified file 'src/sound-service-dbus.c'
--- src/sound-service-dbus.c	2011-06-16 14:43:37 +0000
+++ src/sound-service-dbus.c	2011-08-03 17:37:55 +0000
@@ -56,6 +56,7 @@
   GDBusConnection*    connection;
   DbusmenuMenuitem*   root_menuitem;
   Device*             device;
+  gboolean            greeter_mode;
 };
 
 static GDBusNodeInfo *            node_info = NULL;
@@ -144,9 +145,10 @@
 }
 
 DbusmenuMenuitem*
-sound_service_dbus_create_root_item (SoundServiceDbus* self)
+sound_service_dbus_create_root_item (SoundServiceDbus* self, gboolean greeter_mode)
 {
   SoundServiceDbusPrivate * priv = SOUND_SERVICE_DBUS_GET_PRIVATE(self);
+  priv->greeter_mode = greeter_mode;
   priv->root_menuitem = dbusmenu_menuitem_new();
   //g_debug("Root ID: %d", dbusmenu_menuitem_get_id(priv->root_menuitem));
   DbusmenuServer *server = dbusmenu_server_new (INDICATOR_SOUND_MENU_DBUS_OBJECT_PATH);
@@ -169,25 +171,27 @@
   dbusmenu_menuitem_child_add_position (priv->root_menuitem, slider_item, 1);
   dbusmenu_menuitem_child_add_position (priv->root_menuitem, voip_input_menu_item, 2);
 
-  // Separator
-  DbusmenuMenuitem* separator = dbusmenu_menuitem_new();
-
-  dbusmenu_menuitem_property_set (separator,
-                                  DBUSMENU_MENUITEM_PROP_TYPE,
-                                  DBUSMENU_CLIENT_TYPES_SEPARATOR);
-  dbusmenu_menuitem_child_add_position (priv->root_menuitem, separator, 3);
-  g_object_unref (separator);
-
-  // Sound preferences dialog
-  DbusmenuMenuitem* settings_mi = dbusmenu_menuitem_new();
-
-  dbusmenu_menuitem_property_set( settings_mi,
-                                  DBUSMENU_MENUITEM_PROP_LABEL,
-                                  _("Sound Settings..."));
-  dbusmenu_menuitem_child_append(priv->root_menuitem, settings_mi);
-  g_object_unref (settings_mi);  
-  g_signal_connect(G_OBJECT(settings_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
-                   G_CALLBACK(show_sound_settings_dialog), NULL);  
+  if (!priv->greeter_mode) {
+    // Separator
+    DbusmenuMenuitem* separator = dbusmenu_menuitem_new();
+
+    dbusmenu_menuitem_property_set (separator,
+                                    DBUSMENU_MENUITEM_PROP_TYPE,
+                                    DBUSMENU_CLIENT_TYPES_SEPARATOR);
+    dbusmenu_menuitem_child_add_position (priv->root_menuitem, separator, 3);
+    g_object_unref (separator);
+
+    // Sound preferences dialog
+    DbusmenuMenuitem* settings_mi = dbusmenu_menuitem_new();
+
+    dbusmenu_menuitem_property_set( settings_mi,
+                                    DBUSMENU_MENUITEM_PROP_LABEL,
+                                    _("Sound Settings..."));
+    dbusmenu_menuitem_child_append(priv->root_menuitem, settings_mi);
+    g_object_unref (settings_mi);  
+    g_signal_connect(G_OBJECT(settings_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
+                     G_CALLBACK(show_sound_settings_dialog), NULL);  
+  }
 }
 
 /**

=== modified file 'src/sound-service-dbus.h'
--- src/sound-service-dbus.h	2011-02-16 18:37:15 +0000
+++ src/sound-service-dbus.h	2011-08-03 17:37:55 +0000
@@ -53,7 +53,7 @@
 
 GType sound_service_dbus_get_type  (void) G_GNUC_CONST;
 
-DbusmenuMenuitem* sound_service_dbus_create_root_item (SoundServiceDbus* self);
+DbusmenuMenuitem* sound_service_dbus_create_root_item (SoundServiceDbus* self, gboolean greeter_mode);
 void sound_service_dbus_update_sound_state (SoundServiceDbus* self, SoundState new_state);
 void sound_service_dbus_build_sound_menu ( SoundServiceDbus* self,
                                            DbusmenuMenuitem* mute_item,

=== modified file 'src/sound-service.c'
--- src/sound-service.c	2011-03-22 19:53:19 +0000
+++ src/sound-service.c	2011-08-03 17:37:55 +0000
@@ -47,12 +47,21 @@
   return;
 }
 
+static gboolean
+get_greeter_mode (void)
+{
+  const gchar *var;
+  var = g_getenv("INDICATOR_GREETER_MODE");
+  return (g_strcmp0(var, "1") == 0);
+}
+
 /**
 main:
 **/
 int
 main (int argc, char ** argv)
 {
+  gboolean greeter_mode;
   
   g_type_init();
   textdomain (GETTEXT_PACKAGE);
@@ -67,9 +76,13 @@
 
   SoundServiceDbus* sound_service = g_object_new(SOUND_SERVICE_DBUS_TYPE, NULL);
   
-  DbusmenuMenuitem* root_menuitem = sound_service_dbus_create_root_item(sound_service);
-  MusicPlayerBridge* server = music_player_bridge_new();
-  music_player_bridge_set_root_menu_item(server, root_menuitem);
+  greeter_mode = get_greeter_mode();
+
+  DbusmenuMenuitem* root_menuitem = sound_service_dbus_create_root_item(sound_service, greeter_mode);
+  if (!greeter_mode) {
+    MusicPlayerBridge* server = music_player_bridge_new();
+    music_player_bridge_set_root_menu_item(server, root_menuitem);
+  }
 
   // Run the loop
   mainloop = g_main_loop_new(NULL, FALSE);