Only load seat files with a .seat extension

2 files changed, 8 insertions, 4 deletions

diff --git a/src/ck-manager.c b/src/ck-manager.c
index cce4e0f..ae399e8 100644
--- a/src/ck-manager.c
+++ b/src/ck-manager.c
@@ -2660,10 +2660,12 @@ load_seats_from_dir (CkManager *manager)
         }
 
         while ((file = g_dir_read_name (d)) != NULL) {
-                char *path;
-                path = g_build_filename (CK_SEAT_DIR, file, NULL);
-                add_seat_for_file (manager, path);
-                g_free (path);
+                if (g_str_has_suffix (file, ".seat")) {
+                        char *path;
+                        path = g_build_filename (CK_SEAT_DIR, file, NULL);
+                        add_seat_for_file (manager, path);
+                        g_free (path);
+                }
         }
 
         g_dir_close (d);
diff --git a/src/ck-seat.c b/src/ck-seat.c
index af7db59..2e48963 100644
--- a/src/ck-seat.c
+++ b/src/ck-seat.c
@@ -770,6 +770,8 @@ ck_seat_register (CkSeat *seat)
 {
         GError *error = NULL;
 
+        g_return_val_if_fail (CK_IS_SEAT (seat), FALSE);
+
         error = NULL;
         seat->priv->connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
         if (seat->priv->connection == NULL) {