summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2004-08-11 08:00:37 +0000
committerKjartan Maraas <kmaraas@src.gnome.org>2004-08-11 08:00:37 +0000
commit8bb2ff0efca308b502d23d410aea7e3fd34d694d (patch)
treebe341c22e680abc8202986d12e7b94067684ffd8
parent126f55d4da71604a35427a8855dcd561010f6989 (diff)
downloadgconf-8bb2ff0efca308b502d23d410aea7e3fd34d694d.tar.gz
Use NULL in place of 0. Added nb to ALL_LINGUAS. ANSI parameter list
2004-08-11 Kjartan Maraas <kmaraas@gnome.org> * backends/xml-cache.c: (cache_clean): Use NULL in place of 0. * configure.in: Added nb to ALL_LINGUAS. * gconf/gconf-internals.c: (gconf_invalid_corba_value): ANSI parameter list warning. * gconf/gconf-sanity-check.c: (ensure_gtk): NULL vs. 0 * gconf/gconfd.c: (main): Same. Closes bug #149843.
-rw-r--r--ChangeLog9
-rw-r--r--backends/xml-cache.c2
-rw-r--r--configure.in2
-rw-r--r--gconf/gconf-internals.c2
-rw-r--r--gconf/gconf-sanity-check.c2
-rw-r--r--gconf/gconfd.c18
6 files changed, 22 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 6f74a6cf..3c5e36a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-08-11 Kjartan Maraas <kmaraas@gnome.org>
+
+ * backends/xml-cache.c: (cache_clean): Use NULL in place of 0.
+ * configure.in: Added nb to ALL_LINGUAS.
+ * gconf/gconf-internals.c: (gconf_invalid_corba_value): ANSI
+ parameter list warning.
+ * gconf/gconf-sanity-check.c: (ensure_gtk): NULL vs. 0
+ * gconf/gconfd.c: (main): Same. Closes bug #149843.
+
2004-08-10 Mark McLoughlin <mark@skynet.ie>
* gconf/gconftool.c: (main): set the umask for
diff --git a/backends/xml-cache.c b/backends/xml-cache.c
index a2690ac3..79c25507 100644
--- a/backends/xml-cache.c
+++ b/backends/xml-cache.c
@@ -326,7 +326,7 @@ void
cache_clean (Cache *cache,
GTime older_than)
{
- CleanData cd = { 0, 0, 0 };
+ CleanData cd = { 0, NULL, 0 };
cd.cache = cache;
cd.length = older_than;
diff --git a/configure.in b/configure.in
index cf3959a2..33f4a220 100644
--- a/configure.in
+++ b/configure.in
@@ -240,7 +240,7 @@ AC_CHECK_FUNCS(usleep)
AC_CHECK_FUNCS(flockfile)
-ALL_LINGUAS="am ar az be bg bn ca cs cy da de el en_CA en_GB es eu fa fi fr ga gl gu hi hr hu id it ja ko lt lv mk ml mn ms ne nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr uk vi yi zh_CN zh_TW ta"
+ALL_LINGUAS="am ar az be bg bn ca cs cy da de el en_CA en_GB es eu fa fi fr ga gl gu hi hr hu id it ja ko lt lv mk ml mn ms nb ne nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi yi zh_CN zh_TW"
AM_GLIB_GNU_GETTEXT
diff --git a/gconf/gconf-internals.c b/gconf/gconf-internals.c
index c79c4987..b7f3c1ba 100644
--- a/gconf/gconf-internals.c
+++ b/gconf/gconf-internals.c
@@ -424,7 +424,7 @@ gconf_corba_value_from_gconf_value (const GConfValue* value)
}
ConfigValue*
-gconf_invalid_corba_value ()
+gconf_invalid_corba_value (void)
{
ConfigValue* cv;
diff --git a/gconf/gconf-sanity-check.c b/gconf/gconf-sanity-check.c
index 9df80c4f..19c7b99a 100644
--- a/gconf/gconf-sanity-check.c
+++ b/gconf/gconf-sanity-check.c
@@ -413,7 +413,7 @@ ensure_gtk (void)
if (!done_init)
{
- ok = gtk_init_check (0, NULL);
+ ok = gtk_init_check (NULL, NULL);
done_init = TRUE;
}
diff --git a/gconf/gconfd.c b/gconf/gconfd.c
index b115eeb1..fa9531e4 100644
--- a/gconf/gconfd.c
+++ b/gconf/gconfd.c
@@ -649,17 +649,17 @@ main(int argc, char** argv)
act.sa_handler = signal_handler;
act.sa_mask = empty_mask;
act.sa_flags = 0;
- sigaction (SIGTERM, &act, 0);
- sigaction (SIGILL, &act, 0);
- sigaction (SIGBUS, &act, 0);
- sigaction (SIGFPE, &act, 0);
- sigaction (SIGHUP, &act, 0);
- sigaction (SIGSEGV, &act, 0);
- sigaction (SIGABRT, &act, 0);
- sigaction (SIGUSR1, &act, 0);
+ sigaction (SIGTERM, &act, NULL);
+ sigaction (SIGILL, &act, NULL);
+ sigaction (SIGBUS, &act, NULL);
+ sigaction (SIGFPE, &act, NULL);
+ sigaction (SIGHUP, &act, NULL);
+ sigaction (SIGSEGV, &act, NULL);
+ sigaction (SIGABRT, &act, NULL);
+ sigaction (SIGUSR1, &act, NULL);
act.sa_handler = SIG_IGN;
- sigaction (SIGINT, &act, 0);
+ sigaction (SIGINT, &act, NULL);
CORBA_exception_init(&ev);