X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=fb534d82cce211f902e723e8e85ba32afb39ff5d;hb=2b51051578ef29b031d0927388c4d62baa3c525e;hp=f25bee0d79da93df087d7e2173e6af03e7d8bc70;hpb=3fb9b40025dd8aac7f9c899a4bddbd78ba51e2f6;p=psensor.git

diff --git a/src/main.c b/src/main.c
index f25bee0..fb534d8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 jeanfi@gmail.com
+ * Copyright (C) 2010-2012 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -74,12 +74,13 @@ static const char *program_name;
 static void print_version()
 {
 	printf("psensor %s\n", VERSION);
-	printf(_("Copyright (C) %s jeanfi@gmail.com\n\
-License GPLv2: GNU GPL version 2 or later \
-<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\n\
-This is free software: you are free to change and redistribute it.\n\
-There is NO WARRANTY, to the extent permitted by law.\n"),
-	       "2010-2011");
+	printf(_("Copyright (C) %s jeanfi@gmail.com\n"
+		 "License GPLv2: GNU GPL version 2 or later "
+		 "<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\n"
+		 "This is free software: you are free to change and "
+		 " redistribute it.\n"
+		 "There is NO WARRANTY, to the extent permitted by law.\n"),
+	       "2010-2012");
 }
 
 static void print_help()
@@ -91,15 +92,18 @@ static void print_help()
 
 	puts("");
 	puts(_("Options:"));
-	puts(_("\
-  -h, --help          display this help and exit\n\
-  -v, --version       display version information and exit"));
+	puts(_("  -h, --help          display this help and exit\n"
+	       "  -v, --version       display version information and exit"));
 
 	puts("");
 
-	puts(_("\
-  -u, --url=URL       \
-the URL of the psensor-server, example: http://hostname:3131"));
+	puts(_("  -u, --url=URL       "
+	       "the URL of the psensor-server, example: http://hostname:3131"));
+
+	puts("");
+
+	puts(_("  -d, --debug=LEVEL   "
+	       "set the debug level, integer between 0 and 3"));
 
 	puts("");
 
@@ -372,14 +376,26 @@ static gboolean initial_window_show(gpointer data)
 	return FALSE;
 }
 
+static void log_glib_info()
+{
+	log_debug("Compiled with GLib %d.%d.%d",
+		  GLIB_MAJOR_VERSION,
+		  GLIB_MINOR_VERSION,
+		  GLIB_MICRO_VERSION);
+
+	log_debug("Running with GLib %d.%d.%d",
+		  glib_major_version,
+		  glib_minor_version,
+		  glib_micro_version);
+}
+
 int main(int argc, char **argv)
 {
 	struct ui_psensor ui;
 	GError *error;
 	GThread *thread;
-	int optc;
+	int optc, cmdok;
 	char *url = NULL;
-	int cmdok = 1;
 
 	program_name = argv[0];
 
@@ -390,6 +406,7 @@ int main(int argc, char **argv)
 	textdomain(PACKAGE);
 #endif
 
+	cmdok = 1;
 	while ((optc = getopt_long(argc, argv, "vhd:u:", long_options,
 				   NULL)) != -1) {
 		switch (optc) {
@@ -404,8 +421,8 @@ int main(int argc, char **argv)
 			print_version();
 			exit(EXIT_SUCCESS);
 		case 'd':
-			printf(_("Enables debug mode.\n"));
 			log_level = atoi(optarg);
+			log_printf(LOG_INFO, _("Enables debug mode."));
 			break;
 		default:
 			cmdok = 0;
@@ -421,9 +438,17 @@ int main(int argc, char **argv)
 
 	log_init();
 
+	log_glib_info();
+#if !(GLIB_CHECK_VERSION(2, 31, 0))
+	/*
+	 * Since GLib 2.31 g_thread_init call is deprecated and not
+	 * needed.
+	 */
+	log_debug("Calling g_thread_init(NULL)");
 	g_thread_init(NULL);
+#endif
+
 	gdk_threads_init();
-	/* gdk_threads_enter(); */
 
 	gtk_init(NULL, NULL);