Merge lp:~ted/indicator-appmenu/lp921288 into lp:indicator-appmenu/0.4

[Ted Gould]

Make an error a warning so we don't get apport bugs.

[Lars Karlitski (larsu)]

There are more g_error() calls in there which shouldn't be fatal:

$ grep 'g_error\>' -r src/*
src/hud-dbus.c: g_error("Unable to parse HUD interface: %s", error->message);
src/hud-dbus.c: g_error("Unable to find interface '" DBUS_IFACE "'");
src/hud-dump-application.c: g_error("Usage: %s <desktop file path> [gettext domain]\n", argc[0]);

I think we should also replace those before merging.

review: Needs Fixing

[Ted Gould (ted)]

On Thu, 2012-02-09 at 06:54 +0000, Lars Uebernickel wrote:
> src/hud-dbus.c: g_error("Unable to parse HUD interface: %s", error->message);
> src/hud-dbus.c: g_error("Unable to find interface '" DBUS_IFACE "'");

I actually think these should be fatal. Considering the interface is
compiled in at built time... they *really* shouldn't fail. I'd like to
have the test suite fail in those cases.

> src/hud-dump-application.c: g_error("Usage: %s <desktop file path> [gettext domain]\n", argc[0]);

Yup, should print on STDERR not be an error. r157

[lp:~ted/indicator-appmenu/lp921288]

157. By Ted Gould on 2012-02-09

Printing on STDERR not causing an error. Oops.

[Lars Karlitski (larsu)]

Great, works for me ;)

review: Approve

=== modified file 'src/hud-dump-application.c'
--- src/hud-dump-application.c	2012-01-25 05:21:19 +0000
+++ src/hud-dump-application.c	2012-02-09 14:24:25 +0000
@@ -26,7 +26,7 @@
 main (int argv, char * argc[])
 {
 	if (argv != 2 && argv != 3) {
-		g_error("Usage: %s <desktop file path> [gettext domain]\n", argc[0]);
+		g_printerr("Usage: %s <desktop file path> [gettext domain]\n", argc[0]);
 		return 1;
 	}
 

=== modified file 'src/hud-service.c'
--- src/hud-service.c	2011-12-12 03:05:16 +0000
+++ src/hud-service.c	2012-02-09 14:24:25 +0000
@@ -30,7 +30,7 @@
 static void
 name_lost_cb (GDBusConnection * connection, const gchar * name, gpointer user_data)
 {
-	g_error("Unable to get name '%s'", name);
+	g_warning("Unable to get name '%s'", name);
 	g_main_loop_quit(mainloop);
 	return;
 }