[Xfce4-commits] [apps/ristretto] 01/04: Revert "Refine previous commit"

[noreply at xfce.org]

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

f   2   4   0   4       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 apps/ristretto.

commit 043b6547ca6ed464579a4a70fb17bb25de7b31f1
Author: Igor <f2404 at yandex.ru>
Date:   Tue Aug 6 12:34:40 2019 -0400

    Revert "Refine previous commit"
    
    This reverts commit 673bfaf9ae93962386e0ac399720d618122ade10.
---
 src/xfce_wallpaper_manager.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/xfce_wallpaper_manager.c b/src/xfce_wallpaper_manager.c
index a00ba24..edf20e5 100644
--- a/src/xfce_wallpaper_manager.c
+++ b/src/xfce_wallpaper_manager.c
@@ -78,7 +78,7 @@ configure_monitor_chooser_pixbuf (
     RsttoXfceWallpaperManager *manager );
 
 static gchar *
-get_human_monitor_name (const gchar *prop_name);
+get_human_monitor_name (gchar *prop_name);
 static gchar *
 retrieve_monitor_name (gint monitor_id);
 
@@ -126,7 +126,7 @@ enum
 };
 
 static gchar *
-get_human_monitor_name (const gchar *prop_name)
+get_human_monitor_name (gchar *prop_name)
 {
     GRegex *regex;
     GMatchInfo *info;
@@ -149,10 +149,10 @@ static gchar *
 retrieve_monitor_name (gint monitor_id)
 {
     GDBusProxy *proxy;
-    GError *err = NULL;
+    GError *err;
     GVariant *variant;
     GVariantIter *iter;
-    gchar *key, *monitor_name = NULL, *result;
+    gchar *key, *monitor_name, *result;
 
     proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
                                            G_DBUS_PROXY_FLAGS_NONE,
@@ -163,7 +163,7 @@ retrieve_monitor_name (gint monitor_id)
                                            NULL, &err);
     if (proxy == NULL)
     {
-        g_warning ("Could not get access to the D-Bus interface: %s",
+        g_warning ("Could not access to the D-Bus interface: %s",
                    err->message);
         g_error_free (err);
     }
@@ -177,7 +177,7 @@ retrieve_monitor_name (gint monitor_id)
                                           -1, NULL, &err);
         if (variant == NULL)
         {
-            g_warning ("Method failed: %s", err->message);
+            g_warning ("Can't invoke the method: %s", err->message);
             g_error_free (err);
         }
         else
@@ -198,7 +198,7 @@ retrieve_monitor_name (gint monitor_id)
 
     if (monitor_name)
     {
-        result = g_strdup (monitor_name);
+        result = g_strdup_printf ("%s", monitor_name);
         g_free (monitor_name);
     }
     else

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