From: Kaj-Michael Lang <milang@onion.tal.org>
Date: Mon, 13 Aug 2007 13:02:37 +0000 (+0300)
Subject: Mark only localy used function static. Use glib i18n header.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94dcfd33002d90f4cffa7fdfb0ae1eabf1316ac4;p=mapper

Mark only localy used function static. Use glib i18n header.
---

diff --git a/src/mapper.c b/src/mapper.c
index 9a9cbf9..6a7520d 100644
--- a/src/mapper.c
+++ b/src/mapper.c
@@ -24,8 +24,6 @@
 
 #define _GNU_SOURCE
 
-#define _(String) gettext(String)
-
 #include <config.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -36,6 +34,7 @@
 #include <errno.h>
 #include <sys/wait.h>
 #include <glib/gstdio.h>
+#include <glib/gi18n.h>
 #ifdef WITH_GST
 #include <gst/gst.h>
 #endif
@@ -96,7 +95,8 @@ GdkColor COLORABLE_DEFAULT[COLORABLE_ENUM_COUNT] = {
  * Save state and destroy all non-UI elements created by this program in
  * preparation for exiting.
  */
-void mapper_destroy(void)
+static void 
+mapper_destroy(void)
 {
 	printf("%s()\n", __PRETTY_FUNCTION__);
 
@@ -160,7 +160,8 @@ void set_var_defaults(void)
 _conn_state = RCVR_OFF;
 }
 
-gint mapper_osso_init(void)
+static gint 
+mapper_osso_init(void)
 {
 #ifdef WITH_OSSO
 /* Initialize _osso. */
@@ -173,7 +174,8 @@ if (!_osso) {
 return 0;
 }
 
-gint mapper_osso_cb_init(void)
+static gint 
+mapper_osso_cb_init(void)
 {
 #ifdef WITH_OSSO
 if (OSSO_OK != osso_rpc_set_default_cb_f(_osso, dbus_cb_default, NULL)) {
@@ -184,7 +186,8 @@ if (OSSO_OK != osso_rpc_set_default_cb_f(_osso, dbus_cb_default, NULL)) {
 return 0;
 }
 
-void timezone_init(void)
+static void 
+timezone_init(void)
 {
 time_t time1;
 struct tm time2;
@@ -194,7 +197,8 @@ localtime_r(&time1, &time2);
 _gmtoffset = time2.tm_gmtoff;
 }
 
-gint main(gint argc, gchar * argv[])
+gint 
+main(gint argc, gchar * argv[])
 {
 	printf("%s()\n", __PRETTY_FUNCTION__);
 
@@ -206,10 +210,8 @@ gint main(gint argc, gchar * argv[])
 
 	g_thread_init(NULL);
 	g_type_init();
-#ifdef WITH_OSSO
 	if (mapper_osso_init()!=0)
 		return 1;
-#endif
 	set_var_defaults();	
 #ifdef WITH_GST
 	gst_init(&argc, &argv);
@@ -222,10 +224,8 @@ gint main(gint argc, gchar * argv[])
 	timezone_init();
 	gpx_init();
 	mapper_init(argc, argv);
-#ifdef WITH_OSSO
 	if (mapper_osso_cb_init()!=0)
 		return 1;
-#endif
 	gtk_main();
 	mapper_destroy();
 #ifdef WITH_GST