Merge lp:~chipaca/ubuntu-push/fixes-to-app_helper into lp:ubuntu-push/automatic

[John Lenton]

Fixes to app_helper

Fixes to app_helper

[Samuele Pedroni (pedronis)]

looks good

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~chipaca/ubuntu-push/fixes-to-app_helper into lp:ubuntu-push/automatic failed. Below is the output from the failed tests.

scripts/deps.sh ubuntu-push-client.go
scripts/deps.sh server/dev/server.go
scripts/deps.sh server/acceptance/cmd/acceptanceclient.go
/mnt/tarmac/cache/ubuntu-push-automatic/go-ws/bin/godeps -t launchpad.net/ubuntu-push launchpad.net/ubuntu-push/bus launchpad.net/ubuntu-push/bus/connectivity launchpad.net/ubuntu-push/bus/networkmanager launchpad.net/ubuntu-push/bus/notifications launchpad.net/ubuntu-push/bus/notifications/app_helper launchpad.net/ubuntu-push/bus/systemimage launchpad.net/ubuntu-push/bus/testing launchpad.net/ubuntu-push/bus/urldispatcher launchpad.net/ubuntu-push/client launchpad.net/ubuntu-push/client/gethosts launchpad.net/ubuntu-push/client/service launchpad.net/ubuntu-push/client/session launchpad.net/ubuntu-push/client/session/seenstate launchpad.net/ubuntu-push/config launchpad.net/ubuntu-push/external/murmur3 launchpad.net/ubuntu-push/launch_helper launchpad.net/ubuntu-push/logger launchpad.net/ubuntu-push/messaging launchpad.net/ubuntu-push/messaging/cmessaging launchpad.net/ubuntu-push/messaging/reply launchpad.net/ubuntu-push/nih launchpad.net/ubuntu-push/nih/cnih launchpad.net/ubuntu-push/protocol launchpad.net/ubuntu-push/server launchpad.net/ubuntu-push/server/api launchpad.net/ubuntu-push/server/broker launchpad.net/ubuntu-push/server/broker/simple launchpad.net/ubuntu-push/server/broker/testing launchpad.net/ubuntu-push/server/broker/testsuite launchpad.net/ubuntu-push/server/dev launchpad.net/ubuntu-push/server/listener launchpad.net/ubuntu-push/server/session launchpad.net/ubuntu-push/server/store launchpad.net/ubuntu-push/testing launchpad.net/ubuntu-push/testing/condition launchpad.net/ubuntu-push/util launchpad.net/ubuntu-push/whoopsie launchpad.net/ubuntu-push/whoopsie/identifier launchpad.net/ubuntu-push/whoopsie/identifier/testing launchpad.net/ubuntu-push/server/acceptance/cmd/ launchpad.net/ubuntu-push/server/dev/ launchpad.net/ubuntu-push/ 2>/dev/null | cat > dependencies.tsv
rm -f -r /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/pkg
mkdir -p /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/bin
mkdir -p /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/pkg
go get -u launchpad.net/godeps
go get -d -u launchpad.net/gocheck launchpad.net/go-dbus/v1 launchpad.net/go-xdg/v0 code.google.com/p/gosqlite/sqlite3 code.google.com/p/go-uuid/uuid
/mnt/tarmac/cache/ubuntu-push-automatic/go-ws/bin/godeps -u dependencies.tsv
go install launchpad.net/gocheck launchpad.net/go-dbus/v1 launchpad.net/go-xdg/v0 code.google.com/p/gosqlite/sqlite3 code.google.com/p/go-uuid/uuid
go test launchpad.net/ubuntu-push launchpad.net/ubuntu-push/bus launchpad.net/ubuntu-push/bus/connectivity launchpad.net/ubuntu-push/bus/networkmanager launchpad.net/ubuntu-push/bus/notifications launchpad.net/ubuntu-push/bus/notifications/app_helper launchpad.net/ubuntu-push/bus/systemimage launchpad.net/ubuntu-push/bus/testing launchpad.net/ubuntu-push/bus/urldispatcher launchpad.net/ubuntu-push/client launchpad.net/ubuntu-push/client/gethosts launchpad.net/ubuntu-push/client/service launchpad.net/ubuntu-push/c...

=== modified file 'bus/notifications/app_helper/app_helper_c.go'
--- bus/notifications/app_helper/app_helper_c.go	2014-06-26 17:03:34 +0000
+++ bus/notifications/app_helper/app_helper_c.go	2014-07-03 15:06:04 +0000
@@ -19,23 +19,28 @@
 
 /*
 #cgo pkg-config: gio-unix-2.0
-#cgo pkg-config: gio-2.0
-#include <stdlib.h>
 #include <glib.h>
 #include <gio/gdesktopappinfo.h>
+
+gchar* app_icon_filename_from_id (gchar* app_id) {
+    gchar* filename = NULL;
+    GAppInfo* app_info = (GAppInfo*)g_desktop_app_info_new (app_id);
+    if (app_info != NULL) {
+        GIcon* icon = g_app_info_get_icon (app_info);
+        if (icon != NULL) {
+            filename = g_icon_to_string (icon);
+            // g_app_info_get_icon has "transfer none"
+        }
+        g_object_unref (app_info);
+    }
+   g_free (app_id);
+   return filename;
+}
 */
 import "C"
-import "unsafe"
 
 func AppIconFromId(appId string) string {
-	_id := C.CString(appId)
-	defer C.free(unsafe.Pointer(_id))
-	_app_info := C.g_desktop_app_info_new(_id)
-	defer C.g_app_info_delete(_app_info)
-	_app_icon := C.g_app_info_get_icon(_app_info)
-	defer C.g_object_unref((C.gpointer)(_app_icon))
-	_icon_string := C.g_icon_to_string(_app_icon)
-	defer C.free(unsafe.Pointer(_icon_string))
-	name := C.GoString((*C.char)(_icon_string))
-	return name
+	name := C.app_icon_filename_from_id((*C.gchar)(C.CString(appId)))
+	defer C.g_free((C.gpointer)(name))
+	return C.GoString((*C.char)(name))
 }