]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Use g_pattern_match_simple() to match config section globbing against seat name.
authorLaércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Thu, 28 Aug 2014 11:51:34 +0000 (08:51 -0300)
committerLaércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Thu, 28 Aug 2014 11:51:34 +0000 (08:51 -0300)
src/lightdm.c

index 192440f97a4911549cd484da5052391605876820..b4bcddbeb3ac102d5aa9a23527bd7613c06bef69 100644 (file)
@@ -156,19 +156,8 @@ get_config_section (const gchar *seat_name)
     {
         if (g_str_has_prefix (*i, "Seat:"))
         {
-            const gchar *seat_name_suffix = *i + strlen ("Seat:");
-            gchar *seat_name_globbing;
-            gboolean matches;
-
-            if (g_str_has_suffix (seat_name_suffix, "*"))
-                seat_name_globbing = g_strndup (seat_name_suffix, strlen (seat_name_suffix) - 1);
-            else
-                seat_name_globbing = g_strdup (seat_name_suffix);
-            
-            matches = g_str_has_prefix (seat_name, seat_name_globbing);
-            g_free (seat_name_globbing);
-
-            if (matches)
+            const gchar *seat_name_glob = *i + strlen ("Seat:");
+            if (g_pattern_match_simple (seat_name_glob, seat_name))
             {
                 config_section = g_strdup (*i);
                 break;