[evolution-data-server] Rename AddressBookView/CalendarView D-Bus members for backward compatibility

[Milan Crha <mcrha src gnome org>]

commit 93a186595a462da1d4dd4bc5c1032d6d00573808
Author: Milan Crha <mcrha redhat com>
Date:   Fri Mar 29 09:29:56 2019 +0100

    Rename AddressBookView/CalendarView D-Bus members for backward compatibility
    
    The methods and signals had been renamed accidentally without proper
    D-Bus service version bump, which breaks at least Flatpak applications
    which compile against latest evolution-data-server, but rely on the host
    system evolution-data-server.
    
    Related to https://gitlab.gnome.org/GNOME/folks/issues/104

 src/addressbook/libebook/e-book-client-view.c      |  7 +++----
 src/addressbook/libedata-book/e-data-book-view.c   |  8 ++++++--
 src/calendar/libecal/e-cal-client-view.c           |  7 +++----
 src/calendar/libedata-cal/e-data-cal-view.c        |  8 ++++++--
 ....gnome.evolution.dataserver.AddressBookView.xml | 23 +++++++++++-----------
 ...org.gnome.evolution.dataserver.CalendarView.xml | 23 +++++++++++-----------
 6 files changed, 40 insertions(+), 36 deletions(-)
---
diff --git a/src/addressbook/libebook/e-book-client-view.c b/src/addressbook/libebook/e-book-client-view.c
index dc4796c2d..f96fbea8b 100644
--- a/src/addressbook/libebook/e-book-client-view.c
+++ b/src/addressbook/libebook/e-book-client-view.c
@@ -624,8 +624,7 @@ book_client_view_progress_cb (EDBusAddressBookView *object,
 
 static void
 book_client_view_complete_cb (EDBusAddressBookView *object,
-                             const gchar *arg_error_name,
-                             const gchar *arg_error_message,
+                             const gchar * const *arg_error,
                               GWeakRef *client_view_weak_ref)
 {
        EBookClientView *client_view;
@@ -644,8 +643,8 @@ book_client_view_complete_cb (EDBusAddressBookView *object,
 
                signal_closure = g_slice_new0 (SignalClosure);
                g_weak_ref_init (&signal_closure->client_view, client_view);
-               if (arg_error_name && *arg_error_name && arg_error_message)
-                       signal_closure->error = g_dbus_error_new_for_dbus_error (arg_error_name, 
arg_error_message);
+               if (arg_error && arg_error[0] && *arg_error[0] && arg_error[1])
+                       signal_closure->error = g_dbus_error_new_for_dbus_error (arg_error[0], arg_error[1]);
                else
                        signal_closure->error = NULL;
 
diff --git a/src/addressbook/libedata-book/e-data-book-view.c 
b/src/addressbook/libedata-book/e-data-book-view.c
index ddaa5bdb5..391cdad32 100644
--- a/src/addressbook/libedata-book/e-data-book-view.c
+++ b/src/addressbook/libedata-book/e-data-book-view.c
@@ -1073,6 +1073,7 @@ e_data_book_view_notify_complete (EDataBookView *view,
                                   const GError *error)
 {
        gchar *error_name, *error_message;
+       const gchar *arg_error[3];
 
        g_return_if_fail (E_IS_DATA_BOOK_VIEW (view));
 
@@ -1102,10 +1103,13 @@ e_data_book_view_notify_complete (EDataBookView *view,
                error_message = g_strdup ("");
        }
 
+       arg_error[0] = error_name;
+       arg_error[1] = error_message;
+       arg_error[2] = NULL;
+
        e_dbus_address_book_view_emit_complete (
                view->priv->dbus_object,
-               error_name,
-               error_message);
+               arg_error);
 
        g_free (error_name);
        g_free (error_message);
diff --git a/src/calendar/libecal/e-cal-client-view.c b/src/calendar/libecal/e-cal-client-view.c
index 70dcb50e9..fdac51a9d 100644
--- a/src/calendar/libecal/e-cal-client-view.c
+++ b/src/calendar/libecal/e-cal-client-view.c
@@ -463,8 +463,7 @@ cal_client_view_progress_cb (EDBusCalendarView *dbus_proxy,
 
 static void
 cal_client_view_complete_cb (EDBusCalendarView *dbus_proxy,
-                            const gchar *arg_error_name,
-                            const gchar *arg_error_message,
+                            const gchar * const *arg_error,
                              GWeakRef *client_view_weak_ref)
 {
        ECalClientView *client_view;
@@ -483,8 +482,8 @@ cal_client_view_complete_cb (EDBusCalendarView *dbus_proxy,
 
                signal_closure = g_slice_new0 (SignalClosure);
                g_weak_ref_init (&signal_closure->client_view, client_view);
-               if (arg_error_name && *arg_error_name && arg_error_message)
-                       signal_closure->error = g_dbus_error_new_for_dbus_error (arg_error_name, 
arg_error_message);
+               if (arg_error && arg_error[0] && *arg_error[0] && arg_error[1])
+                       signal_closure->error = g_dbus_error_new_for_dbus_error (arg_error[0], arg_error[1]);
                else
                        signal_closure->error = NULL;
 
diff --git a/src/calendar/libedata-cal/e-data-cal-view.c b/src/calendar/libedata-cal/e-data-cal-view.c
index 416d74c58..f60d0da4d 100644
--- a/src/calendar/libedata-cal/e-data-cal-view.c
+++ b/src/calendar/libedata-cal/e-data-cal-view.c
@@ -1379,6 +1379,7 @@ e_data_cal_view_notify_complete (EDataCalView *view,
                                  const GError *error)
 {
        gchar *error_name, *error_message;
+       const gchar *arg_error[3];
 
        g_return_if_fail (E_IS_DATA_CAL_VIEW (view));
 
@@ -1405,10 +1406,13 @@ e_data_cal_view_notify_complete (EDataCalView *view,
                error_message = g_strdup ("");
        }
 
+       arg_error[0] = error_name;
+       arg_error[1] = error_message;
+       arg_error[2] = NULL;
+
        e_dbus_calendar_view_emit_complete (
                view->priv->dbus_object,
-               error_name,
-               error_message);
+               arg_error);
 
        g_free (error_name);
        g_free (error_message);
diff --git a/src/private/org.gnome.evolution.dataserver.AddressBookView.xml 
b/src/private/org.gnome.evolution.dataserver.AddressBookView.xml
index bf481a464..5629f3751 100644
--- a/src/private/org.gnome.evolution.dataserver.AddressBookView.xml
+++ b/src/private/org.gnome.evolution.dataserver.AddressBookView.xml
@@ -12,40 +12,39 @@
 -->
 <interface name="org.gnome.evolution.dataserver.AddressBookView">
 
-  <signal name="ObjectsAdded">
+  <signal name="objects_added">
     <arg name="objects" type="as"/>
   </signal>
 
-  <signal name="ObjectsModified">
+  <signal name="objects_modified">
     <arg name="objects" type="as"/>
   </signal>
 
-  <signal name="ObjectsRemoved">
+  <signal name="objects_removed">
     <arg name="uids" type="as"/>
   </signal>
 
-  <signal name="Progress">
+  <signal name="progress">
     <arg name="percent" type="u"/>
     <arg name="message" type="s"/>
   </signal>
 
-  <signal name="Complete">
-    <arg name="error_name" type="s"/>
-    <arg name="error_message" type="s"/>
+  <signal name="complete">
+    <arg name="error" type="as"/>
   </signal>
 
-  <method name="Start"/>
+  <method name="start"/>
 
-  <method name="Stop"/>
+  <method name="stop"/>
 
-  <method name="SetFlags">
+  <method name="set_flags">
     <arg name="flags" type="u"/>
   </method>
 
-  <method name="SetFieldsOfInterest">
+  <method name="set_fields_of_interest">
     <arg name="only_fields" direction="in" type="as"/>
   </method>
 
-  <method name="Dispose"/>
+  <method name="dispose"/>
 
 </interface>
diff --git a/src/private/org.gnome.evolution.dataserver.CalendarView.xml 
b/src/private/org.gnome.evolution.dataserver.CalendarView.xml
index 805902938..729bebbe8 100644
--- a/src/private/org.gnome.evolution.dataserver.CalendarView.xml
+++ b/src/private/org.gnome.evolution.dataserver.CalendarView.xml
@@ -12,40 +12,39 @@
 -->
 <interface name="org.gnome.evolution.dataserver.CalendarView">
 
-  <signal name="ObjectsAdded">
+  <signal name="objects_added">
     <arg name="objects" type="as"/>
   </signal>
 
-  <signal name="ObjectsModified">
+  <signal name="objects_modified">
     <arg name="objects" type="as"/>
   </signal>
 
-  <signal name="ObjectsRemoved">
+  <signal name="objects_removed">
     <arg name="uids" type="as"/>
   </signal>
 
-  <signal name="Progress">
+  <signal name="progress">
     <arg name="percent" type="u"/>
     <arg name="message" type="s"/>
   </signal>
 
-  <signal name="Complete">
-    <arg name="error_name" type="s"/>
-    <arg name="error_message" type="s"/>
+  <signal name="complete">
+    <arg name="error" type="as"/>
   </signal>
 
-  <method name="Start"/>
+  <method name="start"/>
 
-  <method name="Stop"/>
+  <method name="stop"/>
 
-  <method name="SetFlags">
+  <method name="set_flags">
     <arg name="flags" type="u"/>
   </method>
 
-  <method name="SetFieldsOfInterest">
+  <method name="set_fields_of_interest">
     <arg name="only_fields" direction="in" type="as"/>
   </method>
 
-  <method name="Dispose"/>
+  <method name="dispose"/>
 
 </interface>