[glib: 5/11] Fix redefinition of local variable in gio/gapplicationimpl-dbus.c




commit 3214a0f3334fc8ca2f130795953ceb32414d8c4d
Author: Loic Le Page <llepage fluendo com>
Date:   Wed Jan 19 18:29:13 2022 +0100

    Fix redefinition of local variable in gio/gapplicationimpl-dbus.c

 gio/gapplicationimpl-dbus.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gio/gapplicationimpl-dbus.c b/gio/gapplicationimpl-dbus.c
index 5604b9260f..da4d17ea62 100644
--- a/gio/gapplicationimpl-dbus.c
+++ b/gio/gapplicationimpl-dbus.c
@@ -376,20 +376,20 @@ g_application_impl_attempt_primary (GApplicationImpl  *impl,
 
   if (org_gtk_Application == NULL)
     {
-      GError *error = NULL;
+      GError *my_error = NULL;
       GDBusNodeInfo *info;
 
-      info = g_dbus_node_info_new_for_xml (org_gtk_Application_xml, &error);
+      info = g_dbus_node_info_new_for_xml (org_gtk_Application_xml, &my_error);
       if G_UNLIKELY (info == NULL)
-        g_error ("%s", error->message);
+        g_error ("%s", my_error->message);
       org_gtk_Application = g_dbus_node_info_lookup_interface (info, "org.gtk.Application");
       g_assert (org_gtk_Application != NULL);
       g_dbus_interface_info_ref (org_gtk_Application);
       g_dbus_node_info_unref (info);
 
-      info = g_dbus_node_info_new_for_xml (org_freedesktop_Application_xml, &error);
+      info = g_dbus_node_info_new_for_xml (org_freedesktop_Application_xml, &my_error);
       if G_UNLIKELY (info == NULL)
-        g_error ("%s", error->message);
+        g_error ("%s", my_error->message);
       org_freedesktop_Application = g_dbus_node_info_lookup_interface (info, "org.freedesktop.Application");
       g_assert (org_freedesktop_Application != NULL);
       g_dbus_interface_info_ref (org_freedesktop_Application);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]