mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-04-16 04:28:05 +02:00
Fix redefinition of local variable in gio/gapplicationimpl-dbus.c
This commit is contained in:
parent
0c1619227c
commit
3214a0f333
@ -376,20 +376,20 @@ g_application_impl_attempt_primary (GApplicationImpl *impl,
|
|||||||
|
|
||||||
if (org_gtk_Application == NULL)
|
if (org_gtk_Application == NULL)
|
||||||
{
|
{
|
||||||
GError *error = NULL;
|
GError *my_error = NULL;
|
||||||
GDBusNodeInfo *info;
|
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)
|
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");
|
org_gtk_Application = g_dbus_node_info_lookup_interface (info, "org.gtk.Application");
|
||||||
g_assert (org_gtk_Application != NULL);
|
g_assert (org_gtk_Application != NULL);
|
||||||
g_dbus_interface_info_ref (org_gtk_Application);
|
g_dbus_interface_info_ref (org_gtk_Application);
|
||||||
g_dbus_node_info_unref (info);
|
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)
|
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");
|
org_freedesktop_Application = g_dbus_node_info_lookup_interface (info, "org.freedesktop.Application");
|
||||||
g_assert (org_freedesktop_Application != NULL);
|
g_assert (org_freedesktop_Application != NULL);
|
||||||
g_dbus_interface_info_ref (org_freedesktop_Application);
|
g_dbus_interface_info_ref (org_freedesktop_Application);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user