summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2008-01-10 20:54:31 +0000
committerKjartan Maraas <kmaraas@src.gnome.org>2008-01-10 20:54:31 +0000
commit85ecc380d73e61234a4ae3eb0d23c721e04b585d (patch)
tree598a758944a7db9f65e7034dbda62c550a2849f0 /examples
parent1c2dd8f09795c748585cae4be1d9d872730448e6 (diff)
downloadgconf-85ecc380d73e61234a4ae3eb0d23c721e04b585d.tar.gz
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
Diffstat (limited to 'examples')
-rw-r--r--examples/basic-gconf-app.schemas38
-rw-r--r--examples/simple-controller.c2
-rw-r--r--examples/simple-view.c2
3 files changed, 18 insertions, 24 deletions
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,