[Xfce4-commits] [xfce/xfce4-panel] 16/24: In show preferences via D-Bus the socket param is not required anymore

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

o   c   h   o   s   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfce4-panel.

commit a02438858352edf4c7453fceef32141a8fd08df6
Author: Ali Abdallah <ali at xfce.org>
Date:   Tue Jun 27 21:12:44 2017 +0200

    In show preferences via D-Bus the socket param is not required anymore
---
 panel/main.c                       | 2 +-
 panel/panel-dbus-client.c          | 2 --
 panel/panel-dbus-client.h          | 1 -
 panel/panel-dbus-service-infos.xml | 1 -
 panel/panel-dbus-service.c         | 2 --
 5 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/panel/main.c b/panel/main.c
index f3f77ed..9e2339b 100644
--- a/panel/main.c
+++ b/panel/main.c
@@ -277,7 +277,7 @@ main (gint argc, gchar **argv)
   else if (opt_preferences >= 0)
     {
       /* send a signal to the running instance to show the preferences dialog */
-      succeed = panel_dbus_client_display_preferences_dialog (opt_preferences, opt_socket_id, &error);
+      succeed = panel_dbus_client_display_preferences_dialog (opt_preferences, &error);
       goto dbus_return;
     }
   else if (opt_add_items >= 0)
diff --git a/panel/panel-dbus-client.c b/panel/panel-dbus-client.c
index 2f955ef..f86e1e1 100644
--- a/panel/panel-dbus-client.c
+++ b/panel/panel-dbus-client.c
@@ -64,7 +64,6 @@ panel_dbus_client_get_proxy (GError **error)
 
 gboolean
 panel_dbus_client_display_preferences_dialog (guint         active,
-                                              const gchar  *socket_id,
                                               GError      **error)
 {
   XfcePanelExportedService *dbus_proxy;
@@ -78,7 +77,6 @@ panel_dbus_client_display_preferences_dialog (guint         active,
 
   result = xfce_panel_exported_service_call_display_preferences_dialog_sync (dbus_proxy,
                                                                              active,
-                                                                             socket_id,
                                                                              NULL,
                                                                              error);
 
diff --git a/panel/panel-dbus-client.h b/panel/panel-dbus-client.h
index e8b8fce..cbd3dde 100644
--- a/panel/panel-dbus-client.h
+++ b/panel/panel-dbus-client.h
@@ -23,7 +23,6 @@
 #include <gdk/gdk.h>
 
 gboolean  panel_dbus_client_display_preferences_dialog (guint         active,
-                                                        const gchar  *socket_id,
                                                         GError      **error);
 
 gboolean  panel_dbus_client_display_items_dialog       (guint         active,
diff --git a/panel/panel-dbus-service-infos.xml b/panel/panel-dbus-service-infos.xml
index a0eaa6d..42e977d 100644
--- a/panel/panel-dbus-service-infos.xml
+++ b/panel/panel-dbus-service-infos.xml
@@ -19,7 +19,6 @@
     -->
     <method name="DisplayPreferencesDialog">
       <arg name="active" direction="in" type="u" />
-      <arg name="socket_id" direction="in" type="s" />
     </method>
 
     <!--
diff --git a/panel/panel-dbus-service.c b/panel/panel-dbus-service.c
index c404088..622cbcb 100644
--- a/panel/panel-dbus-service.c
+++ b/panel/panel-dbus-service.c
@@ -49,7 +49,6 @@ static void      panel_dbus_service_plugin_event_result        (XfcePanelPluginP
 static gboolean  panel_dbus_service_display_preferences_dialog (XfcePanelExportedService *skeleton,
                                                                 GDBusMethodInvocation    *invocation,
                                                                 guint                     active,
-                                                                const gchar              *socket_id,
                                                                 PanelDBusService         *service);
 static gboolean  panel_dbus_service_display_items_dialog       (XfcePanelExportedService *skeleton,
                                                                 GDBusMethodInvocation    *invocation,
@@ -197,7 +196,6 @@ static gboolean
 panel_dbus_service_display_preferences_dialog (XfcePanelExportedService *skeleton,
                                                GDBusMethodInvocation    *invocation,
                                                guint                     active,
-                                               const gchar              *socket_id,
                                                PanelDBusService         *service)
 {
   panel_return_val_if_fail (PANEL_IS_DBUS_SERVICE (service), FALSE);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.