gconf r2509 - in trunk: . backends examples gconf

[kmaraas svn gnome org]

Author: kmaraas
Date: Thu Jan 10 20:54:31 2008
New Revision: 2509
URL: http://svn.gnome.org/viewvc/gconf?rev=2509&view=rev

Log:
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.

Modified:
   trunk/ChangeLog
   trunk/backends/xml-dir.c
   trunk/configure.in
   trunk/examples/basic-gconf-app.schemas
   trunk/examples/simple-controller.c
   trunk/examples/simple-view.c
   trunk/gconf/gconf-changeset.c
   trunk/gconf/gconf.c

Modified: trunk/backends/xml-dir.c
==============================================================================
--- trunk/backends/xml-dir.c	(original)
+++ trunk/backends/xml-dir.c	Thu Jan 10 20:54:31 2008
@@ -956,12 +956,6 @@
     dir_forget_entry_if_useless (d, e);
 }
 
-GTime
-dir_last_access (Dir* d)
-{
-  return d->last_access;
-}
-
 /* private Dir functions */
 
 static void

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Jan 10 20:54:31 2008
@@ -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 @@
 
 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 

Modified: trunk/examples/basic-gconf-app.schemas
==============================================================================
--- trunk/examples/basic-gconf-app.schemas	(original)
+++ trunk/examples/basic-gconf-app.schemas	Thu Jan 10 20:54:31 2008
@@ -21,14 +21,13 @@
       <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 @@
       <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>
-      </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>
+        <default>default value</default>
+        <short>Short description in C locale</short>
+        <long>Long description of baz in C locale.</long>
+      </locale>
+      <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 @@
       <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>
 
-
-
-

Modified: trunk/examples/simple-controller.c
==============================================================================
--- trunk/examples/simple-controller.c	(original)
+++ trunk/examples/simple-controller.c	Thu Jan 10 20:54:31 2008
@@ -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;

Modified: trunk/examples/simple-view.c
==============================================================================
--- trunk/examples/simple-view.c	(original)
+++ trunk/examples/simple-view.c	Thu Jan 10 20:54:31 2008
@@ -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,

Modified: trunk/gconf/gconf-changeset.c
==============================================================================
--- trunk/gconf/gconf-changeset.c	(original)
+++ trunk/gconf/gconf-changeset.c	Thu Jan 10 20:54:31 2008
@@ -409,7 +409,7 @@
  * Change
  */
 
-Change*
+static Change*
 change_new    (const gchar* key)
 {
   Change* c;
@@ -423,7 +423,7 @@
   return c;
 }
 
-void
+static void
 change_destroy(Change* c)
 {
   g_return_if_fail(c != NULL);
@@ -436,7 +436,7 @@
   g_free(c);
 }
 
-void
+static void
 change_set    (Change* c, GConfValue* value)
 {
   g_return_if_fail(value == NULL ||
@@ -453,7 +453,7 @@
   c->value = value;
 }
 
-void
+static void
 change_unset  (Change* c)
 {
   c->type = CHANGE_UNSET;

Modified: trunk/gconf/gconf.c
==============================================================================
--- trunk/gconf/gconf.c	(original)
+++ trunk/gconf/gconf.c	Thu Jan 10 20:54:31 2008
@@ -2280,9 +2280,9 @@
   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;