View | Details | Raw Unified
Collapse All | Expand All

(-) src/NetworkManagerDbus.c.orig (-3 / +3 lines)
 Lines 831-840    Link Here  
	}
	}

        
	dbus_error_init (&error);
	dbus_error_init (&error);

            

              
#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)

              
#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;
	flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT;

            

              
              
#else

            

            

              
              
	flags = DBUS_NAME_FLAG_DO_NOT_QUEUE;	/* Prohibit replacement is now the default */

            

        
#endif
#endif

        
	ret = dbus_bus_request_name (connection, NM_DBUS_SERVICE, flags, &error);
	ret = dbus_bus_request_name (connection, NM_DBUS_SERVICE, flags, &error);

        
	if (dbus_error_is_set (&error))
	if (dbus_error_is_set (&error))