summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2006-06-09 22:12:51 +0000
committerBrian Cameron <bcameron@src.gnome.org>2006-06-09 22:12:51 +0000
commitfa072f5f9f4825319d6bdc409639e84c94040268 (patch)
treebc2639c50ec5292fb8a89815720e370632a9c1d8
parente2ce5a275c2553e2d1bfc756a18d05d0e92a5b2c (diff)
downloadgdm-fa072f5f9f4825319d6bdc409639e84c94040268.tar.gz
Fix more warnings.
2006-06-09 Brian Cameron <brian.cameron@sun.com> * daemon/gdmconfig.c, gui/gdmconfig.c, gui/gdmsetup.c: Fix more warnings.
-rw-r--r--ChangeLog5
-rw-r--r--daemon/gdmconfig.c2
-rw-r--r--gui/gdmconfig.c2
-rw-r--r--gui/gdmsetup.c4
4 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 80af0b90..6c352891 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-06-09 Brian Cameron <brian.cameron@sun.com>
+ * daemon/gdmconfig.c, gui/gdmconfig.c, gui/gdmsetup.c: Fix
+ more warnings.
+
+2006-06-09 Brian Cameron <brian.cameron@sun.com>
+
* daemon/verify-pam.c: Fix autologin Pam service name. Fixes bug
#344191.
* daemon/gdmconfig.c, gui/gdmconfig.c, gui/gdmdynamic.c,
diff --git a/daemon/gdmconfig.c b/daemon/gdmconfig.c
index 61d356ab..4f66d232 100644
--- a/daemon/gdmconfig.c
+++ b/daemon/gdmconfig.c
@@ -1880,7 +1880,7 @@ gdm_load_displays (VeConfig *cfg, GList *list )
*
* Called by gdm_config_parse in a loop to set each key.
*/
-void
+static void
gdm_load_config_option (gpointer key_in, gpointer value_in, gpointer data)
{
gchar *key = (gchar *)key_in;
diff --git a/gui/gdmconfig.c b/gui/gdmconfig.c
index 12e1dbcd..2a7d7045 100644
--- a/gui/gdmconfig.c
+++ b/gui/gdmconfig.c
@@ -627,7 +627,7 @@ gdm_config_reload_string (gchar *key)
return changed;
}
-gboolean
+static gboolean
gdm_config_reload_translated_string (gchar *key)
{
gboolean changed;
diff --git a/gui/gdmsetup.c b/gui/gdmsetup.c
index 99acc360..93b73ea6 100644
--- a/gui/gdmsetup.c
+++ b/gui/gdmsetup.c
@@ -1506,6 +1506,7 @@ setup_notify_toggle (const char *name,
}
}
+#ifdef HAVE_LIBXDMCP
static void
setup_xdmcp_notify_toggle (const char *name,
const char *key)
@@ -1526,6 +1527,7 @@ setup_xdmcp_notify_toggle (const char *name,
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (toggle_toggled), NULL);
}
+#endif
static const char *
get_root_user (void)
@@ -1673,6 +1675,7 @@ setup_intspin (const char *name,
G_CALLBACK (intspin_changed), NULL);
}
+#ifdef HAVE_LIBXDMCP
static void
setup_xdmcp_intspin (const char *name,
const char *key)
@@ -1694,6 +1697,7 @@ setup_xdmcp_intspin (const char *name,
g_signal_connect (G_OBJECT (spin), "value_changed",
G_CALLBACK (intspin_changed), NULL);
}
+#endif
static GtkListStore *
setup_include_exclude (GtkWidget *treeview, const char *key)