diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2006-02-24 23:50:22 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2006-02-24 23:50:22 +0000 |
| commit | c549cca34eef11887c85ae7b4fac139996499330 (patch) | |
| tree | 75c6e8e96be92853eaeeb451f6a3b899f55b8275 /gui/gdmsetup.c | |
| parent | 3f86de5d2f4d7f224ef7d2ed023a1e2a96e1dbac (diff) | |
| download | gdm-c549cca34eef11887c85ae7b4fac139996499330.tar.gz | |
Clean up memory handling.
2006-02-24 Brian Cameron <brian.cameron@sun.com>
* gui/gdmconfig.c, gui/gdmsetup.c: Clean up memory handling.
Diffstat (limited to 'gui/gdmsetup.c')
| -rw-r--r-- | gui/gdmsetup.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/gui/gdmsetup.c b/gui/gdmsetup.c index 80cc8690..7a996164 100644 --- a/gui/gdmsetup.c +++ b/gui/gdmsetup.c @@ -49,16 +49,16 @@ #include "gdmuser.h" #include "gdmconfig.h" -static char *GdmSoundProgram = NULL; -gchar *GdmExclude = NULL; -gchar *GdmInclude = NULL; -gint GdmMinimalUID = 100; -gint GdmIconMaxHeight; -gint GdmIconMaxWidth; -gboolean GdmIncludeAll; -gboolean GdmAllowRoot; -gboolean GdmAllowRemoteRoot; -gboolean GdmUserChangesUnsaved; +static char *GdmSoundProgram = NULL; +static gchar *GdmExclude = NULL; +static gchar *GdmInclude = NULL; +static gint GdmMinimalUID = 100; +static gint GdmIconMaxHeight; +static gint GdmIconMaxWidth; +static gboolean GdmIncludeAll; +static gboolean GdmAllowRoot; +static gboolean GdmAllowRemoteRoot; +static gboolean GdmUserChangesUnsaved; /* set the DOING_GDM_DEVELOPMENT env variable if you want to * search for the glade file in the current dir and not the system @@ -1718,9 +1718,11 @@ setup_include_exclude (GtkWidget *treeview, const char *key) gtk_tree_view_set_model (GTK_TREE_VIEW(treeview), (GTK_TREE_MODEL (face_store))); - if (strcmp (ve_sure_string (key), GDM_KEY_INCLUDE) == 0) + if ((! ve_string_empty (GdmInclude)) && + (strcmp (ve_sure_string (key), GDM_KEY_INCLUDE) == 0)) list = g_strsplit (GdmInclude, ",", 0); - else if (strcmp (ve_sure_string (key), GDM_KEY_EXCLUDE) == 0) + else if ((! ve_string_empty (GdmExclude)) && + (strcmp (ve_sure_string (key), GDM_KEY_EXCLUDE) == 0)) list = g_strsplit (GdmExclude, ",", 0); else list = NULL; |