Bump version

2008-01-10  Kjartan Maraas  <kmaraas@gnome.org>

	* configure.in: Bump version
	* backends/xml-dir.c:
	* examples/basic-gconf-app.schemas:
	* examples/simple-controller.c:
	* examples/simple-view.c:
	* gconf/gconf-changeset.c:
	* gconf/gconf.c:
	Mark some functions and variables static.
	Closes bug #142295.

svn path=/trunk/; revision=2509

8 files changed, 38 insertions, 38 deletions

diff --git a/ChangeLog b/ChangeLog
index 5d42518b..4ca87ac0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-01-10  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* configure.in: Bump version
+	* backends/xml-dir.c:
+	* examples/basic-gconf-app.schemas:
+	* examples/simple-controller.c:
+	* examples/simple-view.c:
+	* gconf/gconf-changeset.c:
+	* gconf/gconf.c:
+	Mark some functions and variables static.
+	Closes bug #142295.
+
 2008-01-09  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* gconf-2.0.pc.in: glib-2.0, not glib. Thanks
diff --git a/backends/xml-dir.c b/backends/xml-dir.c
index 70387276..324dc59f 100644
--- a/backends/xml-dir.c
+++ b/backends/xml-dir.c
@@ -956,12 +956,6 @@ dir_set_schema  (Dir         *d,
     dir_forget_entry_if_useless (d, e);
 }
 
-GTime
-dir_last_access (Dir* d)
-{
-  return d->last_access;
-}
-
 /* private Dir functions */
 
 static void
diff --git a/configure.in b/configure.in
index 804fc153..45fb82e0 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT([GConf],[2.21.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=GConf],[GConf])
+AC_INIT([GConf],[2.21.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=GConf],[GConf])
 
 AC_DEFUN([AC_FYI], [echo "FYI: " $1])
 
@@ -78,7 +78,7 @@ GCONF_CURRENT=5
 
 dnl increment any time the source changes; set to 
 dnl  0 if you increment CURRENT
-GCONF_REVISION=3
+GCONF_REVISION=4
 
 dnl increment if any interfaces have been added; set to 0
 dnl  if any interfaces have been removed. removal has 
diff --git a/examples/basic-gconf-app.schemas b/examples/basic-gconf-app.schemas
index 78e64169..24c4fe32 100644
--- a/examples/basic-gconf-app.schemas
+++ b/examples/basic-gconf-app.schemas
@@ -21,14 +21,13 @@ To change the gconftool target use the - -config-source=blah option to gconftool
       <owner>basic-gconf-app</owner>
       <type>string</type>
       <locale name="C">
-        <default>Blah blah blurgh</default>
+        <default>default value</default>
         <short>short description in C locale</short>
-        <long>long description of foo and bar in C locale</long>
+        <long>Long description of foo and bar in C locale.</long>
       </locale>
-      <locale name="no">
-        <default>some thing in norwegian</default>
-        <short>short description in Norway</short>
-        <long>Long description in Norway. long long long. this is a long sentence.</long>
+      <locale name="nb">
+        <short>Short description in Norwegian</short>
+        <long>Long description in Norwegian. Long long long. This is a long sentence.</long>
       </locale>
     </schema>
       <schema>
@@ -37,14 +36,13 @@ To change the gconftool target use the - -config-source=blah option to gconftool
       <owner>basic-gconf-app</owner>
       <type>string</type>
       <locale name="C">
-        <default>Zzzzzzzzzz</default>
-        <short>short description in C locale</short>
-        <long>long description of baz in C locale</long>
+        <default>default value</default>
+        <short>Short description in C locale</short>
+        <long>Long description of baz in C locale.</long>
       </locale>
-      <locale name="no">
-        <default>some thing in norwegian</default>
-        <short>short description in Norway</short>
-        <long>Long description in Norway. long long long. this is a long sentence.</long>
+      <locale name="nb">
+        <short>Short description in Norwegian</short>
+        <long>Long description in Norwegian. Long long long. This is a long sentence.</long>
       </locale>
     </schema>
       <schema>
@@ -53,20 +51,16 @@ To change the gconftool target use the - -config-source=blah option to gconftool
       <owner>basic-gconf-app</owner>
       <type>string</type>
       <locale name="C">
-        <default>bllllllaaaaaaaaaaaaaaaaarrrrrrggggggghhhhh</default>
-        <short>short description in C locale</short>
-        <long>long description of blah in C locale</long>
+        <default>default value</default>
+        <short>Short description in C locale</short>
+        <long>Long description of blah in C locale.</long>
       </locale>
       <locale name="no">
-        <default>some thing in norwegian</default>
-        <short>short description in Norway</short>
-        <long>Long description in Norway. long long long. this is a long sentence.</long>
+        <short>Short description in Norwegian</short>
+        <long>Long description in Norwegian. Long long long. This is a long sentence.</long>
       </locale>
     </schema>
   </schemalist>
   
 </gconfschemafile>
 
-
-
-
diff --git a/examples/simple-controller.c b/examples/simple-controller.c
index 463c8a9c..f436688c 100644
--- a/examples/simple-controller.c
+++ b/examples/simple-controller.c
@@ -24,7 +24,7 @@
 #include <gconf/gconf-client.h>
 #include <gtk/gtk.h>
 
-void
+static void
 entry_activated_callback(GtkWidget* entry, gpointer user_data)
 {
   GConfClient* client;
diff --git a/examples/simple-view.c b/examples/simple-view.c
index e1f39878..f6c77e93 100644
--- a/examples/simple-view.c
+++ b/examples/simple-view.c
@@ -23,7 +23,7 @@
 #include <gconf/gconf-client.h>
 #include <gtk/gtk.h>
 
-void
+static void
 key_changed_callback(GConfClient* client,
                      guint cnxn_id,
                      GConfEntry *entry,
diff --git a/gconf/gconf-changeset.c b/gconf/gconf-changeset.c
index 55840287..ecd0c8e0 100644
--- a/gconf/gconf-changeset.c
+++ b/gconf/gconf-changeset.c
@@ -409,7 +409,7 @@ gconf_change_set_set_pair    (GConfChangeSet* cs, const gchar* key,
  * Change
  */
 
-Change*
+static Change*
 change_new    (const gchar* key)
 {
   Change* c;
@@ -423,7 +423,7 @@ change_new    (const gchar* key)
   return c;
 }
 
-void
+static void
 change_destroy(Change* c)
 {
   g_return_if_fail(c != NULL);
@@ -436,7 +436,7 @@ change_destroy(Change* c)
   g_free(c);
 }
 
-void
+static void
 change_set    (Change* c, GConfValue* value)
 {
   g_return_if_fail(value == NULL ||
@@ -453,7 +453,7 @@ change_set    (Change* c, GConfValue* value)
   c->value = value;
 }
 
-void
+static void
 change_unset  (Change* c)
 {
   c->type = CHANGE_UNSET;
diff --git a/gconf/gconf.c b/gconf/gconf.c
index 3c7b04ac..e79e843c 100644
--- a/gconf/gconf.c
+++ b/gconf/gconf.c
@@ -2280,9 +2280,9 @@ gconf_get_config_server(gboolean start_if_not_found, GError** err)
   return server; /* return what we have, NIL or not */
 }
 
-ConfigListener listener = CORBA_OBJECT_NIL;
+static ConfigListener listener = CORBA_OBJECT_NIL;
 
-void
+static void
 gconf_detach_config_server(void)
 {  
   CORBA_Environment ev;