Attachment #102023 for bug #155279

View | Details | Raw Unified | Return to bug 155279
Collapse All | Expand All




	}

	dbus_error_init (&error);
#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 60)
	flags = DBUS_NAME_FLAG_DO_NOT_QUEUE;	/* Prohibit replacement is now the default */
#else
	flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT;
#else
	flags = DBUS_NAME_FLAG_DO_NOT_QUEUE;	/* Prohibit replacement is now the default */
#endif
	ret = dbus_bus_request_name (connection, NM_DBUS_SERVICE, flags, &error);
	if (dbus_error_is_set (&error))

Return to bug 155279

Lines 831-840 Link Here

(-)src/NetworkManagerDbus.c.orig (-3 / +3 lines)
831	}	831	}
832		832
833	dbus_error_init (&error);	833	dbus_error_init (&error);
834	#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)	834	#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 60)
835	flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; /* Prohibit replacement is now the default */
836	#else
837	flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT;	835	flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT;
		836	#else
		837	flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; /* Prohibit replacement is now the default */
838	#endif	838	#endif
839	ret = dbus_bus_request_name (connection, NM_DBUS_SERVICE, flags, &error);	839	ret = dbus_bus_request_name (connection, NM_DBUS_SERVICE, flags, &error);
840	if (dbus_error_is_set (&error))	840	if (dbus_error_is_set (&error))