Merge lp:~3v1n0/unity/drop-show-menu-dbus into lp:unity

[Marco Trevisan (Treviño)]

PanelService, DBusIndicators: drop support for EntryShowNowChanged signal

We do handle this internally inside unity since long time now, so there's no need
bother the bus for such thing.

[Andrea Azzarone (azzar1)]

Nice diff :D

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'UnityCore/DBusIndicators.cpp'
--- UnityCore/DBusIndicators.cpp	2015-02-09 19:36:04 +0000
+++ UnityCore/DBusIndicators.cpp	2015-10-01 17:18:55 +0000
@@ -74,7 +74,6 @@
   void OnIconsPathChanged(GVariant* parameters);
   void OnEntryActivated(GVariant* parameters);
   void OnEntryActivatedRequest(GVariant* parameters);
-  void OnEntryShowNowChanged(GVariant* parameters);
 
   void OnEntryScroll(std::string const& entry_id, int delta);
   void OnEntryShowMenu(std::string const& entry_id, unsigned int xid, int x, int y, unsigned int button);
@@ -102,7 +101,6 @@
   gproxy_.Connect("IconPathsChanged", sigc::mem_fun(this, &DBusIndicators::Impl::OnIconsPathChanged));
   gproxy_.Connect("EntryActivated", sigc::mem_fun(this, &DBusIndicators::Impl::OnEntryActivated));
   gproxy_.Connect("EntryActivateRequest", sigc::mem_fun(this, &DBusIndicators::Impl::OnEntryActivatedRequest));
-  gproxy_.Connect("EntryShowNowChanged", sigc::mem_fun(this, &DBusIndicators::Impl::OnEntryShowNowChanged));
 
   gproxy_.connected.connect(sigc::mem_fun(this, &DBusIndicators::Impl::OnConnected));
   gproxy_.disconnected.connect(sigc::mem_fun(this, &DBusIndicators::Impl::OnDisconnected));
@@ -242,19 +240,6 @@
     owner_->on_entry_activate_request.emit(entry_name);
 }
 
-void DBusIndicators::Impl::OnEntryShowNowChanged(GVariant* parameters)
-{
-  if (!verify_variant_type(parameters, "(sb)"))
-    return;
-
-  glib::String entry_name;
-  gboolean show_now;
-  g_variant_get(parameters, "(sb)", &entry_name, &show_now);
-
-  if (entry_name)
-    owner_->SetEntryShowNow(entry_name, show_now);
-}
-
 void DBusIndicators::Impl::RequestSyncAll()
 {
   gproxy_.CallBegin("Sync", nullptr, sigc::mem_fun(this, &DBusIndicators::Impl::Sync));

=== modified file 'UnityCore/Indicators.cpp'
--- UnityCore/Indicators.cpp	2015-06-05 14:27:09 +0000
+++ UnityCore/Indicators.cpp	2015-10-01 17:18:55 +0000
@@ -121,11 +121,8 @@
 void Indicators::Impl::SetEntryShowNow(std::string const& entry_id,
                                        bool show_now)
 {
-  Entry::Ptr entry = GetEntry(entry_id);
-  if (entry)
-  {
+  if (Entry::Ptr const& entry = GetEntry(entry_id))
     entry->set_show_now(show_now);
-  }
 }
 
 Indicators::IndicatorsList Indicators::Impl::GetIndicators() const

=== modified file 'services/panel-main.c'
--- services/panel-main.c	2015-01-29 15:39:13 +0000
+++ services/panel-main.c	2015-10-01 17:18:55 +0000
@@ -101,11 +101,6 @@
   "     <arg type='s' name='entry_id' />"
   "    </signal>"
   ""
-  "    <signal name='EntryShowNowChanged'>"
-  "     <arg type='s' name='entry_id' />"
-  "     <arg type='b' name='show_now_state' />"
-  "    </signal>"
-  ""
   "    <signal name='IconPathsChanged' />"
   ""
   "  </interface>"
@@ -330,28 +325,6 @@
 }
 
 static void
-on_service_entry_show_now_changed (PanelService    *service,
-                                   const gchar     *entry_id,
-                                   gboolean         show_now_state,
-                                   GDBusConnection *connection)
-{
-  GError *error = NULL;
-  g_dbus_connection_emit_signal (connection,
-                                 NULL,
-                                 UPS_PATH,
-                                 UPS_IFACE,
-                                 "EntryShowNowChanged",
-                                 g_variant_new ("(sb)", entry_id, show_now_state),
-                                 &error);
-
-  if (error)
-    {
-      g_warning ("Unable to emit EntryShowNowChanged signal: %s", error->message);
-      g_error_free (error);
-    }
-}
-
-static void
 on_icon_theme_changed (GtkIconTheme* theme, GDBusConnection *connection)
 {
   GError *error = NULL;
@@ -391,8 +364,6 @@
                     G_CALLBACK (on_service_entry_activated), connection);
   g_signal_connect (service, "entry-activate-request",
                     G_CALLBACK (on_service_entry_activate_request), connection);
-  g_signal_connect (service, "entry-show-now-changed",
-                    G_CALLBACK (on_service_entry_show_now_changed), connection);
 
   g_signal_connect (gtk_icon_theme_get_default(), "changed",
                     G_CALLBACK (on_icon_theme_changed), connection);

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2015-01-30 10:50:32 +0000
+++ services/panel-service.c	2015-10-01 17:18:55 +0000
@@ -98,7 +98,6 @@
   ENTRY_ACTIVATED = 0,
   RE_SYNC,
   ENTRY_ACTIVATE_REQUEST,
-  ENTRY_SHOW_NOW_CHANGED,
   GEOMETRIES_CHANGED,
   INDICATORS_CLEARED,
 
@@ -250,14 +249,6 @@
                   G_TYPE_OBJECT, G_TYPE_POINTER,
                   G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
 
- _service_signals[ENTRY_SHOW_NOW_CHANGED] =
-    g_signal_new ("entry-show-now-changed",
-                  G_OBJECT_CLASS_TYPE (obj_class),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_BOOLEAN);
-
   _service_signals[INDICATORS_CLEARED] =
     g_signal_new ("indicators-cleared",
                   G_OBJECT_CLASS_TYPE (obj_class),
@@ -1371,26 +1362,6 @@
   g_free (entry_id);
 }
 
-static void
-on_indicator_menu_show_now_changed (IndicatorObject      *object,
-                                    IndicatorObjectEntry *entry,
-                                    gboolean              show_now_changed,
-                                    PanelService         *self)
-{
-  gchar *entry_id;
-  g_return_if_fail (PANEL_IS_SERVICE (self));
-
-  if (!entry)
-    {
-      g_warning ("%s called with a NULL entry", G_STRFUNC);
-      return;
-    }
-
-  entry_id = get_indicator_entry_id_by_entry (entry);
-  g_signal_emit (self, _service_signals[ENTRY_SHOW_NOW_CHANGED], 0, entry_id, show_now_changed);
-  g_free (entry_id);
-}
-
 static const gchar * indicator_environment[] = {
   "unity",
   "unity-3d",
@@ -1428,8 +1399,6 @@
                     G_CALLBACK (on_entry_moved), self);
   g_signal_connect (object, INDICATOR_OBJECT_SIGNAL_MENU_SHOW,
                     G_CALLBACK (on_indicator_menu_show), self);
-  g_signal_connect (object, INDICATOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED,
-                    G_CALLBACK (on_indicator_menu_show_now_changed), self);
 
   entries = indicator_object_get_entries (object);
   for (entry = entries; entry != NULL; entry = entry->next)