mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-09 00:40:19 +01:00
libnm-glib: fix build on older glib without g_clear_object()
This commit is contained in:
parent
8ed02c3039
commit
9c2c4e0591
13 changed files with 27 additions and 2 deletions
|
|
@ -45,7 +45,7 @@
|
|||
|
||||
#define g_clear_object(object_ptr) \
|
||||
G_STMT_START { \
|
||||
GObject **__obj_p = object_ptr; \
|
||||
GObject **__obj_p = (gpointer) (object_ptr); \
|
||||
if (*__obj_p) { \
|
||||
g_object_unref (*__obj_p); \
|
||||
*__obj_p = NULL; \
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@
|
|||
#include <string.h>
|
||||
#include <netinet/ether.h>
|
||||
|
||||
#include "nm-glib-compat.h"
|
||||
|
||||
#include <nm-connection.h>
|
||||
#include <nm-setting-connection.h>
|
||||
#include <nm-setting-wireless.h>
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@
|
|||
#include <string.h>
|
||||
#include <netinet/ether.h>
|
||||
|
||||
#include "nm-glib-compat.h"
|
||||
|
||||
#include <nm-setting-connection.h>
|
||||
#include <nm-setting-bond.h>
|
||||
#include <nm-utils.h>
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@
|
|||
#include <string.h>
|
||||
#include <netinet/ether.h>
|
||||
|
||||
#include "nm-glib-compat.h"
|
||||
|
||||
#include <nm-setting-connection.h>
|
||||
#include <nm-setting-bluetooth.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@
|
|||
#include <string.h>
|
||||
#include <netinet/ether.h>
|
||||
|
||||
#include "nm-glib-compat.h"
|
||||
|
||||
#include <nm-setting-connection.h>
|
||||
#include <nm-setting-wired.h>
|
||||
#include <nm-setting-pppoe.h>
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@
|
|||
#include <linux/if_infiniband.h>
|
||||
#include <netinet/ether.h>
|
||||
|
||||
#include "nm-glib-compat.h"
|
||||
|
||||
#include <nm-setting-connection.h>
|
||||
#include <nm-setting-infiniband.h>
|
||||
#include <nm-utils.h>
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@
|
|||
#include <config.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "nm-glib-compat.h"
|
||||
|
||||
#include <nm-setting-connection.h>
|
||||
#include <nm-setting-gsm.h>
|
||||
#include <nm-setting-cdma.h>
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@
|
|||
#include <config.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "nm-glib-compat.h"
|
||||
|
||||
#include <nm-setting-connection.h>
|
||||
#include <nm-setting-olpc-mesh.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@
|
|||
#include <string.h>
|
||||
#include <netinet/ether.h>
|
||||
|
||||
#include "nm-glib-compat.h"
|
||||
|
||||
#include <nm-setting-connection.h>
|
||||
#include <nm-setting-vlan.h>
|
||||
#include <nm-utils.h>
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@
|
|||
#include <string.h>
|
||||
#include <netinet/ether.h>
|
||||
|
||||
#include "nm-glib-compat.h"
|
||||
|
||||
#include <nm-setting-connection.h>
|
||||
#include <nm-setting-wireless.h>
|
||||
#include <nm-setting-wireless-security.h>
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@
|
|||
#include <string.h>
|
||||
#include <netinet/ether.h>
|
||||
|
||||
#include "nm-glib-compat.h"
|
||||
|
||||
#include <nm-setting-connection.h>
|
||||
#include <nm-setting-wimax.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,9 +21,12 @@
|
|||
#include <config.h>
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
#include <NetworkManager.h>
|
||||
#include <dbus/dbus-glib-lowlevel.h>
|
||||
|
||||
#include "nm-glib-compat.h"
|
||||
|
||||
#include <NetworkManager.h>
|
||||
|
||||
#include "nm-secret-agent.h"
|
||||
#include "nm-glib-enum-types.h"
|
||||
#include "nm-glib-marshal.h"
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@
|
|||
#include <config.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "nm-glib-compat.h"
|
||||
|
||||
#include <nm-connection.h>
|
||||
#include <nm-setting-connection.h>
|
||||
#include <nm-setting-wimax.h>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue