summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2017-12-11 11:02:01 +1300
committerRobert Ancell <robert.ancell@canonical.com>2017-12-11 11:11:58 +1300
commit34e4b30db193c276332685a4ac7b62679ecd3a0e (patch)
treec426cf4509500b7107e58a37896009e1568016ee /src
parent8283fc7b84e456760172f042bafc5827b6fcf29e (diff)
downloadlightdm-git-34e4b30db193c276332685a4ac7b62679ecd3a0e.tar.gz
Remove unnecessary semicolons on the end of macros
Diffstat (limited to 'src')
-rw-r--r--src/accounts.c2
-rw-r--r--src/accounts.h2
-rw-r--r--src/display-manager-service.c2
-rw-r--r--src/display-manager.c2
-rw-r--r--src/display-server.c2
-rw-r--r--src/greeter-session.c2
-rw-r--r--src/greeter-socket.c2
-rw-r--r--src/greeter.c2
-rw-r--r--src/logger.c2
-rw-r--r--src/login1.c6
-rw-r--r--src/process.c2
-rw-r--r--src/process.h2
-rw-r--r--src/seat-local.c2
-rw-r--r--src/seat-unity.c2
-rw-r--r--src/seat-xdmcp-session.c2
-rw-r--r--src/seat-xdmcp-session.h2
-rw-r--r--src/seat-xremote.c2
-rw-r--r--src/seat-xvnc.c2
-rw-r--r--src/seat-xvnc.h2
-rw-r--r--src/seat.c2
-rw-r--r--src/seat.h2
-rw-r--r--src/session-config.c2
-rw-r--r--src/session-config.h2
-rw-r--r--src/session.c2
-rw-r--r--src/session.h2
-rw-r--r--src/shared-data-manager.c2
-rw-r--r--src/unity-system-compositor.c2
-rw-r--r--src/vnc-server.c2
-rw-r--r--src/wayland-session.c2
-rw-r--r--src/x-authority.c2
-rw-r--r--src/x-authority.h2
-rw-r--r--src/x-server-local.c2
-rw-r--r--src/x-server-remote.c2
-rw-r--r--src/x-server-xmir.c2
-rw-r--r--src/x-server-xvnc.c2
-rw-r--r--src/x-server.c2
-rw-r--r--src/xdmcp-server.c2
-rw-r--r--src/xdmcp-session.c2
38 files changed, 40 insertions, 40 deletions
diff --git a/src/accounts.c b/src/accounts.c
index 77cfdf5e..91f05cab 100644
--- a/src/accounts.c
+++ b/src/accounts.c
@@ -22,7 +22,7 @@ struct UserPrivate
CommonUser *common_user;
};
-G_DEFINE_TYPE (User, user, G_TYPE_OBJECT);
+G_DEFINE_TYPE (User, user, G_TYPE_OBJECT)
User *
accounts_get_user_by_name (const gchar *username)
diff --git a/src/accounts.h b/src/accounts.h
index ff40b25f..e6bf4e47 100644
--- a/src/accounts.h
+++ b/src/accounts.h
@@ -34,7 +34,7 @@ typedef struct
GObjectClass parent_class;
} UserClass;
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (User, g_object_unref);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (User, g_object_unref)
User *accounts_get_user_by_name (const gchar *username);
diff --git a/src/display-manager-service.c b/src/display-manager-service.c
index 519ef056..9fbf4413 100644
--- a/src/display-manager-service.c
+++ b/src/display-manager-service.c
@@ -47,7 +47,7 @@ struct DisplayManagerServicePrivate
GHashTable *session_bus_entries;
};
-G_DEFINE_TYPE (DisplayManagerService, display_manager_service, G_TYPE_OBJECT);
+G_DEFINE_TYPE (DisplayManagerService, display_manager_service, G_TYPE_OBJECT)
typedef struct
{
diff --git a/src/display-manager.c b/src/display-manager.c
index 512d4ce9..87a857e6 100644
--- a/src/display-manager.c
+++ b/src/display-manager.c
@@ -42,7 +42,7 @@ struct DisplayManagerPrivate
gboolean stopped;
};
-G_DEFINE_TYPE (DisplayManager, display_manager, G_TYPE_OBJECT);
+G_DEFINE_TYPE (DisplayManager, display_manager, G_TYPE_OBJECT)
DisplayManager *
display_manager_new (void)
diff --git a/src/display-server.c b/src/display-server.c
index cc319c8d..21c176c2 100644
--- a/src/display-server.c
+++ b/src/display-server.c
@@ -35,7 +35,7 @@ struct DisplayServerPrivate
static void display_server_logger_iface_init (LoggerInterface *iface);
G_DEFINE_TYPE_WITH_CODE (DisplayServer, display_server, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (LOGGER_TYPE, display_server_logger_iface_init));
+ G_IMPLEMENT_INTERFACE (LOGGER_TYPE, display_server_logger_iface_init))
const gchar *
display_server_get_session_type (DisplayServer *server)
diff --git a/src/greeter-session.c b/src/greeter-session.c
index 72594794..ace766f1 100644
--- a/src/greeter-session.c
+++ b/src/greeter-session.c
@@ -23,7 +23,7 @@ struct GreeterSessionPrivate
Greeter *greeter;
};
-G_DEFINE_TYPE (GreeterSession, greeter_session, SESSION_TYPE);
+G_DEFINE_TYPE (GreeterSession, greeter_session, SESSION_TYPE)
GreeterSession *
greeter_session_new (void)
diff --git a/src/greeter-socket.c b/src/greeter-socket.c
index 878aeb12..1b0147a2 100644
--- a/src/greeter-socket.c
+++ b/src/greeter-socket.c
@@ -41,7 +41,7 @@ struct GreeterSocketPrivate
Greeter *greeter;
};
-G_DEFINE_TYPE (GreeterSocket, greeter_socket, G_TYPE_OBJECT);
+G_DEFINE_TYPE (GreeterSocket, greeter_socket, G_TYPE_OBJECT)
GreeterSocket *
greeter_socket_new (const gchar *path)
diff --git a/src/greeter.c b/src/greeter.c
index 58529f17..1bbed854 100644
--- a/src/greeter.c
+++ b/src/greeter.c
@@ -83,7 +83,7 @@ struct GreeterPrivate
guint from_greeter_watch;
};
-G_DEFINE_TYPE (Greeter, greeter, G_TYPE_OBJECT);
+G_DEFINE_TYPE (Greeter, greeter, G_TYPE_OBJECT)
#define API_VERSION 1
diff --git a/src/logger.c b/src/logger.c
index 3fe0d290..839882a6 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -1,6 +1,6 @@
#include "logger.h"
-G_DEFINE_INTERFACE (Logger, logger, G_TYPE_INVALID);
+G_DEFINE_INTERFACE (Logger, logger, G_TYPE_INVALID)
static void
logger_logv_default (Logger *self, GLogLevelFlags log_level, const gchar *format, va_list ap) __attribute__ ((format (printf, 3, 0)));
diff --git a/src/login1.c b/src/login1.c
index fdcb438a..ef690cec 100644
--- a/src/login1.c
+++ b/src/login1.c
@@ -69,10 +69,10 @@ struct Login1SeatPrivate
gboolean can_multi_session;
};
-G_DEFINE_TYPE (Login1Service, login1_service, G_TYPE_OBJECT);
-G_DEFINE_TYPE (Login1Seat, login1_seat, G_TYPE_OBJECT);
+G_DEFINE_TYPE (Login1Service, login1_service, G_TYPE_OBJECT)
+G_DEFINE_TYPE (Login1Seat, login1_seat, G_TYPE_OBJECT)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (Login1Seat, g_object_unref);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (Login1Seat, g_object_unref)
static Login1Service *singleton = NULL;
diff --git a/src/process.c b/src/process.c
index b6ff0c9f..ec0ecb5b 100644
--- a/src/process.c
+++ b/src/process.c
@@ -66,7 +66,7 @@ struct ProcessPrivate
guint watch;
};
-G_DEFINE_TYPE (Process, process, G_TYPE_OBJECT);
+G_DEFINE_TYPE (Process, process, G_TYPE_OBJECT)
static Process *current_process = NULL;
static GHashTable *processes = NULL;
diff --git a/src/process.h b/src/process.h
index 11415630..395762fe 100644
--- a/src/process.h
+++ b/src/process.h
@@ -43,7 +43,7 @@ typedef struct
void (*stopped)(Process *process);
} ProcessClass;
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (Process, g_object_unref);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (Process, g_object_unref)
typedef void (*ProcessRunFunc)(Process *process, gpointer user_data);
diff --git a/src/seat-local.c b/src/seat-local.c
index e9433fef..d003b18b 100644
--- a/src/seat-local.c
+++ b/src/seat-local.c
@@ -35,7 +35,7 @@ struct SeatLocalPrivate
XServerLocal *xdmcp_x_server;
};
-G_DEFINE_TYPE (SeatLocal, seat_local, SEAT_TYPE);
+G_DEFINE_TYPE (SeatLocal, seat_local, SEAT_TYPE)
static XServerLocal *create_x_server (SeatLocal *seat);
diff --git a/src/seat-unity.c b/src/seat-unity.c
index f9d30526..2c0b750d 100644
--- a/src/seat-unity.c
+++ b/src/seat-unity.c
@@ -37,7 +37,7 @@ struct SeatUnityPrivate
DisplayServer *active_display_server;
};
-G_DEFINE_TYPE (SeatUnity, seat_unity, SEAT_TYPE);
+G_DEFINE_TYPE (SeatUnity, seat_unity, SEAT_TYPE)
static XServerXmir *create_x_server (Seat *seat);
diff --git a/src/seat-xdmcp-session.c b/src/seat-xdmcp-session.c
index 41998279..ba24dc69 100644
--- a/src/seat-xdmcp-session.c
+++ b/src/seat-xdmcp-session.c
@@ -20,7 +20,7 @@ struct SeatXDMCPSessionPrivate
XDMCPSession *session;
};
-G_DEFINE_TYPE (SeatXDMCPSession, seat_xdmcp_session, SEAT_TYPE);
+G_DEFINE_TYPE (SeatXDMCPSession, seat_xdmcp_session, SEAT_TYPE)
SeatXDMCPSession *
seat_xdmcp_session_new (XDMCPSession *session)
diff --git a/src/seat-xdmcp-session.h b/src/seat-xdmcp-session.h
index 941083d4..a8a3621e 100644
--- a/src/seat-xdmcp-session.h
+++ b/src/seat-xdmcp-session.h
@@ -33,7 +33,7 @@ typedef struct
SeatClass parent_class;
} SeatXDMCPSessionClass;
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (SeatXDMCPSession, g_object_unref);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (SeatXDMCPSession, g_object_unref)
GType seat_xdmcp_session_get_type (void);
diff --git a/src/seat-xremote.c b/src/seat-xremote.c
index 2e260c37..e337b14d 100644
--- a/src/seat-xremote.c
+++ b/src/seat-xremote.c
@@ -15,7 +15,7 @@
#include "configuration.h"
#include "x-server-remote.h"
-G_DEFINE_TYPE (SeatXRemote, seat_xremote, SEAT_TYPE);
+G_DEFINE_TYPE (SeatXRemote, seat_xremote, SEAT_TYPE)
static void
seat_xremote_setup (Seat *seat)
diff --git a/src/seat-xvnc.c b/src/seat-xvnc.c
index 61697e26..eeb861b3 100644
--- a/src/seat-xvnc.c
+++ b/src/seat-xvnc.c
@@ -15,7 +15,7 @@
#include "x-server-xvnc.h"
#include "configuration.h"
-G_DEFINE_TYPE (SeatXVNC, seat_xvnc, SEAT_TYPE);
+G_DEFINE_TYPE (SeatXVNC, seat_xvnc, SEAT_TYPE)
struct SeatXVNCPrivate
{
diff --git a/src/seat-xvnc.h b/src/seat-xvnc.h
index a87d7767..f167e236 100644
--- a/src/seat-xvnc.h
+++ b/src/seat-xvnc.h
@@ -33,7 +33,7 @@ typedef struct
SeatClass parent_class;
} SeatXVNCClass;
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (SeatXVNC, g_object_unref);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (SeatXVNC, g_object_unref)
GType seat_xvnc_get_type (void);
diff --git a/src/seat.c b/src/seat.c
index e028cc63..fa236e72 100644
--- a/src/seat.c
+++ b/src/seat.c
@@ -74,7 +74,7 @@ static void seat_logger_iface_init (LoggerInterface *iface);
G_DEFINE_TYPE_WITH_CODE (Seat, seat, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (
- LOGGER_TYPE, seat_logger_iface_init));
+ LOGGER_TYPE, seat_logger_iface_init))
typedef struct
{
diff --git a/src/seat.h b/src/seat.h
index 8a439334..5af6bc33 100644
--- a/src/seat.h
+++ b/src/seat.h
@@ -61,7 +61,7 @@ typedef struct
void (*stopped)(Seat *seat);
} SeatClass;
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (Seat, g_object_unref);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (Seat, g_object_unref)
GType seat_get_type (void);
diff --git a/src/session-config.c b/src/session-config.c
index 67012c47..13f77cc9 100644
--- a/src/session-config.c
+++ b/src/session-config.c
@@ -26,7 +26,7 @@ struct SessionConfigPrivate
gboolean allow_greeter;
};
-G_DEFINE_TYPE (SessionConfig, session_config, G_TYPE_OBJECT);
+G_DEFINE_TYPE (SessionConfig, session_config, G_TYPE_OBJECT)
SessionConfig *
session_config_new_from_file (const gchar *filename, const gchar *default_session_type, GError **error)
diff --git a/src/session-config.h b/src/session-config.h
index fac72eb5..226aa7dc 100644
--- a/src/session-config.h
+++ b/src/session-config.h
@@ -34,7 +34,7 @@ typedef struct
GObjectClass parent_class;
} SessionConfigClass;
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (SessionConfig, g_object_unref);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (SessionConfig, g_object_unref)
GType session_config_get_type (void);
diff --git a/src/session.c b/src/session.c
index 0b3e839c..d7b531fb 100644
--- a/src/session.c
+++ b/src/session.c
@@ -128,7 +128,7 @@ static void session_logger_iface_init (LoggerInterface *iface);
G_DEFINE_TYPE_WITH_CODE (Session, session, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (
- LOGGER_TYPE, session_logger_iface_init));
+ LOGGER_TYPE, session_logger_iface_init))
Session *
session_new (void)
diff --git a/src/session.h b/src/session.h
index aa883a9d..eb3f0c0e 100644
--- a/src/session.h
+++ b/src/session.h
@@ -66,7 +66,7 @@ typedef struct
void (*stopped)(Session *session);
} SessionClass;
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (Session, g_object_unref);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (Session, g_object_unref)
GType session_get_type (void);
diff --git a/src/shared-data-manager.c b/src/shared-data-manager.c
index 34bc2732..17b5b936 100644
--- a/src/shared-data-manager.c
+++ b/src/shared-data-manager.c
@@ -34,7 +34,7 @@ struct OwnerInfo
guint32 uid;
};
-G_DEFINE_TYPE (SharedDataManager, shared_data_manager, G_TYPE_OBJECT);
+G_DEFINE_TYPE (SharedDataManager, shared_data_manager, G_TYPE_OBJECT)
static SharedDataManager *singleton = NULL;
diff --git a/src/unity-system-compositor.c b/src/unity-system-compositor.c
index 09ecb17e..1bd85fe8 100644
--- a/src/unity-system-compositor.c
+++ b/src/unity-system-compositor.c
@@ -67,7 +67,7 @@ struct UnitySystemCompositorPrivate
static void unity_system_compositor_logger_iface_init (LoggerInterface *iface);
G_DEFINE_TYPE_WITH_CODE (UnitySystemCompositor, unity_system_compositor, DISPLAY_SERVER_TYPE,
- G_IMPLEMENT_INTERFACE (LOGGER_TYPE, unity_system_compositor_logger_iface_init));
+ G_IMPLEMENT_INTERFACE (LOGGER_TYPE, unity_system_compositor_logger_iface_init))
typedef enum
{
diff --git a/src/vnc-server.c b/src/vnc-server.c
index a1515e82..0834df5a 100644
--- a/src/vnc-server.c
+++ b/src/vnc-server.c
@@ -31,7 +31,7 @@ struct VNCServerPrivate
GSocket *socket, *socket6;
};
-G_DEFINE_TYPE (VNCServer, vnc_server, G_TYPE_OBJECT);
+G_DEFINE_TYPE (VNCServer, vnc_server, G_TYPE_OBJECT)
VNCServer *
vnc_server_new (void)
diff --git a/src/wayland-session.c b/src/wayland-session.c
index 331ad252..46d41af2 100644
--- a/src/wayland-session.c
+++ b/src/wayland-session.c
@@ -19,7 +19,7 @@ struct WaylandSessionPrivate
gboolean have_vt_ref;
};
-G_DEFINE_TYPE (WaylandSession, wayland_session, DISPLAY_SERVER_TYPE);
+G_DEFINE_TYPE (WaylandSession, wayland_session, DISPLAY_SERVER_TYPE)
WaylandSession *
wayland_session_new (void)
diff --git a/src/x-authority.c b/src/x-authority.c
index f74c245a..716a2374 100644
--- a/src/x-authority.c
+++ b/src/x-authority.c
@@ -39,7 +39,7 @@ struct XAuthorityPrivate
gsize authorization_data_length;
};
-G_DEFINE_TYPE (XAuthority, x_authority, G_TYPE_OBJECT);
+G_DEFINE_TYPE (XAuthority, x_authority, G_TYPE_OBJECT)
XAuthority *
x_authority_new (guint16 family, const guint8 *address, gsize address_length, const gchar *number, const gchar *name, const guint8 *data, gsize data_length)
diff --git a/src/x-authority.h b/src/x-authority.h
index 7e2c0108..116cce0b 100644
--- a/src/x-authority.h
+++ b/src/x-authority.h
@@ -32,7 +32,7 @@ typedef struct
GObjectClass parent_class;
} XAuthorityClass;
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (XAuthority, g_object_unref);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (XAuthority, g_object_unref)
#define XAUTH_FAMILY_INTERNET 0
#define XAUTH_FAMILY_DECNET 1
diff --git a/src/x-server-local.c b/src/x-server-local.c
index 5597085c..cfa4ab11 100644
--- a/src/x-server-local.c
+++ b/src/x-server-local.c
@@ -71,7 +71,7 @@ struct XServerLocalPrivate
static void x_server_local_logger_iface_init (LoggerInterface *iface);
G_DEFINE_TYPE_WITH_CODE (XServerLocal, x_server_local, X_SERVER_TYPE,
- G_IMPLEMENT_INTERFACE (LOGGER_TYPE, x_server_local_logger_iface_init));
+ G_IMPLEMENT_INTERFACE (LOGGER_TYPE, x_server_local_logger_iface_init))
static gchar *version = NULL;
static guint version_major = 0, version_minor = 0;
diff --git a/src/x-server-remote.c b/src/x-server-remote.c
index 1c12fcd5..c870bedf 100644
--- a/src/x-server-remote.c
+++ b/src/x-server-remote.c
@@ -19,7 +19,7 @@ struct XServerRemotePrivate
guint display_number;
};
-G_DEFINE_TYPE (XServerRemote, x_server_remote, X_SERVER_TYPE);
+G_DEFINE_TYPE (XServerRemote, x_server_remote, X_SERVER_TYPE)
XServerRemote *
x_server_remote_new (const gchar *hostname, guint number, XAuthority *authority)
diff --git a/src/x-server-xmir.c b/src/x-server-xmir.c
index 3ec7dedb..e2c15e89 100644
--- a/src/x-server-xmir.c
+++ b/src/x-server-xmir.c
@@ -27,7 +27,7 @@ struct XServerXmirPrivate
gchar *mir_socket;
};
-G_DEFINE_TYPE (XServerXmir, x_server_xmir, X_SERVER_LOCAL_TYPE);
+G_DEFINE_TYPE (XServerXmir, x_server_xmir, X_SERVER_LOCAL_TYPE)
static void
compositor_ready_cb (UnitySystemCompositor *compositor, XServerXmir *server)
diff --git a/src/x-server-xvnc.c b/src/x-server-xvnc.c
index 95e1d7f0..82de7823 100644
--- a/src/x-server-xvnc.c
+++ b/src/x-server-xvnc.c
@@ -29,7 +29,7 @@ struct XServerXVNCPrivate
gint width, height, depth;
};
-G_DEFINE_TYPE (XServerXVNC, x_server_xvnc, X_SERVER_LOCAL_TYPE);
+G_DEFINE_TYPE (XServerXVNC, x_server_xvnc, X_SERVER_LOCAL_TYPE)
XServerXVNC *
x_server_xvnc_new (void)
diff --git a/src/x-server.c b/src/x-server.c
index d5936190..d6423f18 100644
--- a/src/x-server.c
+++ b/src/x-server.c
@@ -31,7 +31,7 @@ struct XServerPrivate
xcb_connection_t *connection;
};
-G_DEFINE_TYPE (XServer, x_server, DISPLAY_SERVER_TYPE);
+G_DEFINE_TYPE (XServer, x_server, DISPLAY_SERVER_TYPE)
void
x_server_set_hostname (XServer *server, const gchar *hostname)
diff --git a/src/xdmcp-server.c b/src/xdmcp-server.c
index ea254654..8d18707f 100644
--- a/src/xdmcp-server.c
+++ b/src/xdmcp-server.c
@@ -51,7 +51,7 @@ struct XDMCPServerPrivate
GHashTable *sessions;
};
-G_DEFINE_TYPE (XDMCPServer, xdmcp_server, G_TYPE_OBJECT);
+G_DEFINE_TYPE (XDMCPServer, xdmcp_server, G_TYPE_OBJECT)
/* Maximum number of milliseconds client will resend manage requests before giving up */
#define MANAGE_TIMEOUT 126000
diff --git a/src/xdmcp-session.c b/src/xdmcp-session.c
index 967cdf25..4f75e8bc 100644
--- a/src/xdmcp-session.c
+++ b/src/xdmcp-session.c
@@ -12,7 +12,7 @@
#include "xdmcp-session.h"
#include "xdmcp-session-private.h"
-G_DEFINE_TYPE (XDMCPSession, xdmcp_session, G_TYPE_OBJECT);
+G_DEFINE_TYPE (XDMCPSession, xdmcp_session, G_TYPE_OBJECT)
XDMCPSession *
xdmcp_session_new (guint16 id)