Merge branch 'build-warnings' into 'master'

Cleanup some build warnings

See merge request GNOME/gdm!64

7 files changed, 20 insertions, 34 deletions

diff --git a/daemon/gdm-display-store.c b/daemon/gdm-display-store.c
index 910468cd..7df69d9b 100644
--- a/daemon/gdm-display-store.c
+++ b/daemon/gdm-display-store.c
@@ -33,8 +33,6 @@
 #include "gdm-display-store.h"
 #include "gdm-display.h"
 
-#define GDM_DISPLAY_STORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_DISPLAY_STORE, GdmDisplayStorePrivate))
-
 struct GdmDisplayStorePrivate
 {
         GHashTable *displays;
@@ -58,7 +56,7 @@ static void     gdm_display_store_class_init    (GdmDisplayStoreClass *klass);
 static void     gdm_display_store_init          (GdmDisplayStore      *display_store);
 static void     gdm_display_store_finalize      (GObject              *object);
 
-G_DEFINE_TYPE (GdmDisplayStore, gdm_display_store, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GdmDisplayStore, gdm_display_store, G_TYPE_OBJECT)
 
 static StoredDisplay *
 stored_display_new (GdmDisplayStore *store,
@@ -289,15 +287,13 @@ gdm_display_store_class_init (GdmDisplayStoreClass *klass)
                               g_cclosure_marshal_VOID__OBJECT,
                               G_TYPE_NONE,
                               1, G_TYPE_OBJECT);
-
-        g_type_class_add_private (klass, sizeof (GdmDisplayStorePrivate));
 }
 
 static void
 gdm_display_store_init (GdmDisplayStore *store)
 {
 
-        store->priv = GDM_DISPLAY_STORE_GET_PRIVATE (store);
+        store->priv = gdm_display_store_get_instance_private (store);
 
         store->priv->displays = g_hash_table_new_full (g_str_hash,
                                                        g_str_equal,
diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c
index 5e1427b0..feccf057 100644
--- a/daemon/gdm-launch-environment.c
+++ b/daemon/gdm-launch-environment.c
@@ -57,8 +57,6 @@
 
 extern char **environ;
 
-#define GDM_LAUNCH_ENVIRONMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAUNCH_ENVIRONMENT, GdmLaunchEnvironmentPrivate))
-
 struct GdmLaunchEnvironmentPrivate
 {
         GdmSession     *session;
@@ -113,7 +111,7 @@ static void     gdm_launch_environment_class_init    (GdmLaunchEnvironmentClass
 static void     gdm_launch_environment_init          (GdmLaunchEnvironment      *launch_environment);
 static void     gdm_launch_environment_finalize      (GObject                   *object);
 
-G_DEFINE_TYPE (GdmLaunchEnvironment, gdm_launch_environment, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GdmLaunchEnvironment, gdm_launch_environment, G_TYPE_OBJECT)
 
 static GHashTable *
 build_launch_environment (GdmLaunchEnvironment *launch_environment,
@@ -706,8 +704,6 @@ gdm_launch_environment_class_init (GdmLaunchEnvironmentClass *klass)
         object_class->set_property = gdm_launch_environment_set_property;
         object_class->finalize = gdm_launch_environment_finalize;
 
-        g_type_class_add_private (klass, sizeof (GdmLaunchEnvironmentPrivate));
-
         g_object_class_install_property (object_class,
                                          PROP_VERIFICATION_MODE,
                                          g_param_spec_enum ("verification-mode",
@@ -863,7 +859,7 @@ static void
 gdm_launch_environment_init (GdmLaunchEnvironment *launch_environment)
 {
 
-        launch_environment->priv = GDM_LAUNCH_ENVIRONMENT_GET_PRIVATE (launch_environment);
+        launch_environment->priv = gdm_launch_environment_get_instance_private (launch_environment);
 
         launch_environment->priv->command = NULL;
         launch_environment->priv->session = NULL;
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index 9fad80ba..698c9650 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -136,7 +136,8 @@ G_DEFINE_TYPE_WITH_CODE (GdmManager,
                          gdm_manager,
                          GDM_DBUS_TYPE_MANAGER_SKELETON,
                          G_IMPLEMENT_INTERFACE (GDM_DBUS_TYPE_MANAGER,
-                                                manager_interface_init));
+                                                manager_interface_init)
+                         G_ADD_PRIVATE (GdmManager));
 
 #ifdef WITH_PLYMOUTH
 static gboolean
@@ -2722,8 +2723,6 @@ gdm_manager_class_init (GdmManagerClass *klass)
                                                                NULL,
                                                                FALSE,
                                                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
-
-        g_type_class_add_private (klass, sizeof (GdmManagerPrivate));
 }
 
 static void
@@ -2796,10 +2795,8 @@ gdm_manager_dispose (GObject *object)
 #endif
         g_clear_object (&manager->priv->local_factory);
         g_clear_pointer (&manager->priv->open_reauthentication_requests,
-                         (GDestroyNotify)
                          g_hash_table_unref);
         g_clear_pointer (&manager->priv->transient_sessions,
-                         (GDestroyNotify)
                          g_hash_table_unref);
 
         g_list_foreach (manager->priv->user_sessions,
diff --git a/daemon/gdm-session-record.c b/daemon/gdm-session-record.c
index d2df5887..7719d0a8 100644
--- a/daemon/gdm-session-record.c
+++ b/daemon/gdm-session-record.c
@@ -64,16 +64,12 @@ record_set_username (UTMP       *u,
                      const char *username)
 {
 #if defined(HAVE_UT_UT_USER)
-        strncpy (u->ut_user,
-                 username,
-                 sizeof (u->ut_user));
+        memccpy (u->ut_user, username, '\0', sizeof (u->ut_user));
         g_debug ("using ut_user %.*s",
                  (int) sizeof (u->ut_user),
                  u->ut_user);
 #elif defined(HAVE_UT_UT_NAME)
-        strncpy (u->ut_name,
-                 username,
-                 sizeof (u->ut_name));
+        memccpy (u->ut_name, username, '\0', sizeof (u->ut_name));
         g_debug ("using ut_name %.*s",
                  (int) sizeof (u->ut_name),
                  u->ut_name);
@@ -136,7 +132,7 @@ record_set_host (UTMP       *u,
         }
 
         if (hostname != NULL) {
-                strncpy (u->ut_host, hostname, sizeof (u->ut_host));
+                memccpy (u->ut_host, hostname, '\0', sizeof (u->ut_host));
                 g_debug ("using ut_host %.*s", (int) sizeof (u->ut_host), u->ut_host);
 #ifdef HAVE_UT_UT_SYSLEN
                 u->ut_syslen = MIN (strlen (hostname), sizeof (u->ut_host));
@@ -158,12 +154,14 @@ record_set_line (UTMP       *u,
          */
         if (display_device != NULL
             && g_str_has_prefix (display_device, "/dev/")) {
-                strncpy (u->ut_line,
+                memccpy (u->ut_line,
                          display_device + strlen ("/dev/"),
+                         '\0',
                          sizeof (u->ut_line));
         } else if (x11_display_name != NULL) {
-                strncpy (u->ut_line,
+                memccpy (u->ut_line,
                          x11_display_name,
+                         '\0',
                          sizeof (u->ut_line));
         }
 
diff --git a/daemon/gdm-session-settings.c b/daemon/gdm-session-settings.c
index dc7f0986..484a3b5b 100644
--- a/daemon/gdm-session-settings.c
+++ b/daemon/gdm-session-settings.c
@@ -62,7 +62,9 @@ enum {
         PROP_IS_LOADED
 };
 
-G_DEFINE_TYPE (GdmSessionSettings, gdm_session_settings, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GdmSessionSettings,
+                            gdm_session_settings,
+                            G_TYPE_OBJECT)
 
 static void
 gdm_session_settings_class_init (GdmSessionSettingsClass *settings_class)
@@ -74,8 +76,6 @@ gdm_session_settings_class_init (GdmSessionSettingsClass *settings_class)
         object_class->finalize = gdm_session_settings_finalize;
 
         gdm_session_settings_class_install_properties (settings_class);
-
-        g_type_class_add_private (settings_class, sizeof (GdmSessionSettingsPrivate));
 }
 
 static void
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
index aa824bcf..93ae79c9 100644
--- a/daemon/gdm-session-worker.c
+++ b/daemon/gdm-session-worker.c
@@ -211,7 +211,8 @@ G_DEFINE_TYPE_WITH_CODE (GdmSessionWorker,
                          gdm_session_worker,
                          GDM_DBUS_TYPE_WORKER_SKELETON,
                          G_IMPLEMENT_INTERFACE (GDM_DBUS_TYPE_WORKER,
-                                                worker_interface_init))
+                                                worker_interface_init)
+                         G_ADD_PRIVATE (GdmSessionWorker))
 
 /* adapted from glib script_execute */
 static void
@@ -3202,7 +3203,7 @@ gdm_session_worker_handle_start_program (GdmDBusWorker         *object,
 
         g_debug ("GdmSessionWorker: start program: %s", text);
 
-        g_clear_pointer (&worker->priv->arguments, (GDestroyNotify) g_strfreev);
+        g_clear_pointer (&worker->priv->arguments, g_strfreev);
         if (! g_shell_parse_argv (text, NULL, &worker->priv->arguments, &parse_error)) {
                 g_dbus_method_invocation_take_error (invocation, parse_error);
                 return TRUE;
@@ -3460,8 +3461,6 @@ gdm_session_worker_class_init (GdmSessionWorkerClass *klass)
         object_class->constructor = gdm_session_worker_constructor;
         object_class->finalize = gdm_session_worker_finalize;
 
-        g_type_class_add_private (klass, sizeof (GdmSessionWorkerPrivate));
-
         g_object_class_install_property (object_class,
                                          PROP_SERVER_ADDRESS,
                                          g_param_spec_string ("server-address",
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
index d0e09b53..4e303e70 100644
--- a/daemon/gdm-session.c
+++ b/daemon/gdm-session.c
@@ -3163,7 +3163,7 @@ gdm_session_is_wayland_session (GdmSession *self)
         g_debug ("GdmSession: checking if file '%s' is wayland session: %s", filename, is_wayland_session? "yes" : "no");
 
 out:
-        g_clear_pointer (&key_file, (GDestroyNotify) g_key_file_free);
+        g_clear_pointer (&key_file, g_key_file_free);
         g_free (filename);
         return is_wayland_session;
 }