gdm r6219 - in trunk: . gui/simple-greeter

[mccann svn gnome org]

Author: mccann
Date: Tue May  6 17:11:04 2008
New Revision: 6219
URL: http://svn.gnome.org/viewvc/gdm?rev=6219&view=rev

Log:
2008-05-06  William Jon McCann  <jmccann redhat com>

	* gui/simple-greeter/gdm-layouts.c (gdm_get_layout_from_name),
	(gdm_get_all_layout_names), (gdm_layout_activate):
	* gui/simple-greeter/gdm-layouts.h:
	Fix a typo and some style/whitespace issues.



Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/gdm-layout-chooser-widget.c
   trunk/gui/simple-greeter/gdm-layout-option-widget.c
   trunk/gui/simple-greeter/gdm-layouts.c
   trunk/gui/simple-greeter/gdm-layouts.h

Modified: trunk/gui/simple-greeter/gdm-layout-chooser-widget.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-layout-chooser-widget.c	(original)
+++ trunk/gui/simple-greeter/gdm-layout-chooser-widget.c	Tue May  6 17:11:04 2008
@@ -95,21 +95,21 @@
                                           const char         *name)
 {
         char *layout;
-	char *escaped;
+        char *escaped;
 
         layout = gdm_get_layout_from_name (name);
 
         if (layout != NULL) {
-		escaped = g_markup_escape_text (layout, -1);
+                escaped = g_markup_escape_text (layout, -1);
                 gdm_chooser_widget_add_item (GDM_CHOOSER_WIDGET (widget),
-                                             name, 
+                                             name,
                                              NULL,
-                                             escaped, 
+                                             escaped,
                                              NULL,
                                              0,
                                              FALSE,
                                              FALSE);
-		g_free (escaped);
+                g_free (escaped);
                 g_free (layout);
         }
 }
@@ -124,7 +124,7 @@
 
         for (i = 0; layout_names[i] != NULL; i++) {
                 gdm_layout_chooser_widget_add_layout (widget,
-                                                          layout_names[i]);
+                                                      layout_names[i]);
         }
 
         g_strfreev (layout_names);

Modified: trunk/gui/simple-greeter/gdm-layout-option-widget.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-layout-option-widget.c	(original)
+++ trunk/gui/simple-greeter/gdm-layout-option-widget.c	Tue May  6 17:11:04 2008
@@ -144,7 +144,7 @@
                                       char                 **name,
                                       char                 **comment)
 {
-	char *layout;
+        char *layout;
 
         layout = gdm_get_layout_from_name (id);
 
@@ -182,7 +182,7 @@
 
         widget->priv = GDM_LAYOUT_OPTION_WIDGET_GET_PRIVATE (widget);
 
-	error = NULL; 
+        error = NULL;
         gdm_recent_option_widget_set_gconf_key (GDM_RECENT_OPTION_WIDGET (widget),
                                                 "/apps/gdm/simple-greeter/recent-layouts",
                                                 gdm_layout_option_widget_lookup_item,

Modified: trunk/gui/simple-greeter/gdm-layouts.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-layouts.c	(original)
+++ trunk/gui/simple-greeter/gdm-layouts.c	Tue May  6 17:11:04 2008
@@ -31,25 +31,25 @@
 
 #include "gdm-layouts.h"
 
-static XklEngine *engine = NULL;
+static XklEngine         *engine = NULL;
 static XklConfigRegistry *config_registry = NULL;
-static XklConfigRec *initial_config = NULL;
+static XklConfigRec      *initial_config = NULL;
 
 static void
 init_xkl (void)
 {
-	if (config_registry == NULL) {
-		engine = xkl_engine_get_instance (GDK_DISPLAY ());
-		xkl_engine_backup_names_prop (engine);
-		config_registry = xkl_config_registry_get_instance (engine);
-		xkl_config_registry_load (config_registry);
-
-		initial_config = xkl_config_rec_new ();
-		if (!xkl_config_rec_get_from_backup (initial_config, engine)) {
-			g_warning ("failed to load XKB configuration");
-			initial_config->model = g_strdup ("pc105");
-		}
-	}
+        if (config_registry == NULL) {
+                engine = xkl_engine_get_instance (GDK_DISPLAY ());
+                xkl_engine_backup_names_prop (engine);
+                config_registry = xkl_config_registry_get_instance (engine);
+                xkl_config_registry_load (config_registry);
+
+                initial_config = xkl_config_rec_new ();
+                if (!xkl_config_rec_get_from_backup (initial_config, engine)) {
+                        g_warning ("failed to load XKB configuration");
+                        initial_config->model = g_strdup ("pc105");
+                }
+        }
 }
 
 static char *
@@ -57,64 +57,69 @@
 {
         char *sd = g_strstrip (ci->description);
         return sd[0] == 0 ? g_strdup (ci->name) :
-            g_locale_to_utf8 (sd, -1, NULL, NULL, NULL);
+                g_locale_to_utf8 (sd, -1, NULL, NULL, NULL);
 }
 
 gchar *
 gdm_get_layout_from_name (const char *name)
 {
-	XklConfigItem *item;
-	gchar *layout, *variant, *result;
-	char *id1, *id2, *p;
-
-	init_xkl ();
-
-	id1 = g_strdup (name);
-	p = strchr (id1, '\t');
-
-	if (p) {
-		id2 = p + 1;
-		*p = 0;
-	}
-	else 
-		id2 = NULL;
-
-	item = xkl_config_item_new ();
-
-	g_snprintf (item->name, XKL_MAX_CI_NAME_LENGTH, id1);
-	if (xkl_config_registry_find_layout (config_registry, item))
-		layout = xci_desc_to_utf8 (item);
-	else
-		layout =  g_strdup_printf ("Layout %s", id1);
-
-	if (id2) {
-		g_snprintf (item->name, XKL_MAX_CI_NAME_LENGTH, id2);
-		if (xkl_config_registry_find_variant (config_registry, id1, item))
-			variant = xci_desc_to_utf8 (item);
-		else
-			variant = g_strdup_printf ("Variant %s", id2);
-	}
-	else 
-		variant = NULL;
-
-	g_object_unref (item);
-
-	g_free (id1);
-
-	if (variant) {
-		result = g_strdup_printf ("%s (%s)", layout, variant);
-		g_free (layout);
-		g_free (variant);
-	}
-	else
-		result = layout;
+        XklConfigItem *item;
+        char          *layout;
+        char          *variant;
+        char          *result;
+        char          *id1;
+        char          *id2;
+        char          *p;
+
+        init_xkl ();
+
+        id1 = g_strdup (name);
+        p = strchr (id1, '\t');
+
+        if (p != NULL) {
+                id2 = p + 1;
+                *p = 0;
+        } else {
+                id2 = NULL;
+        }
+
+        item = xkl_config_item_new ();
+
+        g_snprintf (item->name, XKL_MAX_CI_NAME_LENGTH, id1);
+        if (xkl_config_registry_find_layout (config_registry, item)) {
+                layout = xci_desc_to_utf8 (item);
+        } else {
+                layout =  g_strdup_printf ("Layout %s", id1);
+        }
+
+        if (id2 != NULL) {
+                g_snprintf (item->name, XKL_MAX_CI_NAME_LENGTH, id2);
+                if (xkl_config_registry_find_variant (config_registry, id1, item))
+                        variant = xci_desc_to_utf8 (item);
+                else
+                        variant = g_strdup_printf ("Variant %s", id2);
+        } else {
+                variant = NULL;
+        }
+
+        g_object_unref (item);
+
+        g_free (id1);
+
+        if (variant != NULL) {
+                result = g_strdup_printf ("%s (%s)", layout, variant);
+                g_free (layout);
+                g_free (variant);
+        } else {
+                result = layout;
+        }
 
-	return result;
+        return result;
 }
 
 typedef struct {
-	GSList *list;
-	char *layout;
+        GSList *list;
+        char *layout;
 } LayoutData;
 
 static void
@@ -122,9 +127,9 @@
              const XklConfigItem *item,
              gpointer             data)
 {
-	LayoutData *ldata = data;
+        LayoutData *ldata = data;
 
-	ldata->list = g_slist_prepend (ldata->list, g_strdup_printf  ("%s\t%s", ldata->layout, item->name));
+        ldata->list = g_slist_prepend (ldata->list, g_strdup_printf  ("%s\t%s", ldata->layout, item->name));
 }
 
 static void
@@ -132,38 +137,40 @@
             const XklConfigItem *item,
             gpointer             data)
 {
-	LayoutData *ldata = data;
+        LayoutData *ldata = data;
 
-	ldata->layout = item->name;
-	ldata->list = g_slist_prepend (ldata->list, g_strdup (item->name));
-	xkl_config_registry_foreach_layout_variant (config, item->name, add_variant, data);
-	ldata->layout = NULL;
+        ldata->layout = item->name;
+        ldata->list = g_slist_prepend (ldata->list, g_strdup (item->name));
+        xkl_config_registry_foreach_layout_variant (config, item->name, add_variant, data);
+        ldata->layout = NULL;
 }
 
 char **
 gdm_get_all_layout_names (void)
 {
-	GSList *l;
-	int len, i;
-        char **layouts;
-	LayoutData data;
+        GSList    *l;
+        int        len;
+        int        i;
+        char     **layouts;
+        LayoutData data;
 
-	init_xkl ();
+        init_xkl ();
 
-	data.list = NULL;
-	data.layout = NULL;
+        data.list = NULL;
+        data.layout = NULL;
 
-	xkl_config_registry_foreach_layout (config_registry, add_layout, &data);
+        xkl_config_registry_foreach_layout (config_registry, add_layout, &data);
 
-	len = g_slist_length (data.list);
+        len = g_slist_length (data.list);
 
         layouts = g_new (char *, len + 1);
-	layouts[len] = NULL;
+        layouts[len] = NULL;
 
-	for (i = 0, l = data.list; i < len; i++, l = l->next) 
-		layouts[len - i - 1] = l->data;
+        for (i = 0, l = data.list; i < len; i++, l = l->next) {
+                layouts[len - i - 1] = l->data;
+        }
 
-	g_slist_free (data.list);
+        g_slist_free (data.list);
 
         return layouts;
 }
@@ -171,34 +178,32 @@
 void
 gdm_layout_activate (const char *layout)
 {
-	XklConfigRec *config;
-	char *p;
+        XklConfigRec *config;
+        char         *p;
 
-	init_xkl ();
+        init_xkl ();
 
-	config = xkl_config_rec_new ();
-	config->model = g_strdup (initial_config->model);
+        config = xkl_config_rec_new ();
+        config->model = g_strdup (initial_config->model);
 
-	if (layout == NULL) {
-		config->layouts = g_strdupv (initial_config->layouts);
-		config->variants = g_strdupv (initial_config->variants);
-		config->options = g_strdupv (initial_config->options);
-	}
-	else {
-		config->layouts = g_new0 (gchar *, 2);
-		config->layouts[0] = g_strdup (layout);
-
-		p = strchr (config->layouts[0], '\t');
-		if (p) {
-				
-			config->variants = g_new0 (gchar *, 2);
-			config->layouts[0][p - config->layouts[0]] = 0;
-			config->variants[0] = g_strdup (p + 1);	
-		}
-	}
-
-	xkl_config_rec_activate (config, engine);
-	
-	g_object_unref (config);
+        if (layout == NULL) {
+                config->layouts = g_strdupv (initial_config->layouts);
+                config->variants = g_strdupv (initial_config->variants);
+                config->options = g_strdupv (initial_config->options);
+        } else {
+                config->layouts = g_new0 (char *, 2);
+                config->layouts[0] = g_strdup (layout);
+
+                p = strchr (config->layouts[0], '\t');
+                if (p != NULL) {
+                        config->variants = g_new0 (char *, 2);
+                        config->layouts[0][p - config->layouts[0]] = 0;
+                        config->variants[0] = g_strdup (p + 1);
+                }
+        }
+
+        xkl_config_rec_activate (config, engine);
+
+        g_object_unref (config);
 }
 

Modified: trunk/gui/simple-greeter/gdm-layouts.h
==============================================================================
--- trunk/gui/simple-greeter/gdm-layouts.h	(original)
+++ trunk/gui/simple-greeter/gdm-layouts.h	Tue May  6 17:11:04 2008
@@ -1,4 +1,4 @@
-/* -*- Modex: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
  *
  * Copyright 2008 Red Hat, Inc.
  *