struct UnityWebappsContext; struct UnityWebappsContextClass; void unity_webapps_context_new (UnityWebappsService *service, -const gchar *name, -const gchar *domain, -const gchar *icon_url, -const gchar *mime_types, +const gchar *name, +const gchar *domain, +const gchar *icon_url, +const gchar *mime_types,UnityWebappsContextReadyCallback callback, -gpointer user_data); +gpointer user_data); UnityWebappsContext * unity_webapps_context_new_sync (UnityWebappsService *service, -const gchar *name, -const gchar *domain, -const gchar *icon_url, -const gchar *mime_types); +const gchar *name, +const gchar *domain, +const gchar *icon_url, +const gchar *mime_types); UnityWebappsContext * unity_webapps_context_new_for_context_name (UnityWebappsService *service, -const gchar *context_name); -const gchar * unity_webapps_context_get_context_name +const gchar *context_name); +const gchar * unity_webapps_context_get_context_name (UnityWebappsContext *context); -const gchar * unity_webapps_context_get_name (UnityWebappsContext *context); -const gchar * unity_webapps_context_get_domain (UnityWebappsContext *context); -const gchar * unity_webapps_context_get_desktop_name +const gchar * unity_webapps_context_get_name (UnityWebappsContext *context); +const gchar * unity_webapps_context_get_domain (UnityWebappsContext *context); +const gchar * unity_webapps_context_get_desktop_name (UnityWebappsContext *context); -gchar * unity_webapps_context_get_icon_name (UnityWebappsContext *context); +gchar * unity_webapps_context_get_icon_name (UnityWebappsContext *context); void unity_webapps_context_add_icon (UnityWebappsContext *context, -const gchar *url, -gint size); -GVariant * unity_webapps_context_list_interests +const gchar *url, +gint size); +GVariant * unity_webapps_context_list_interests (UnityWebappsContext *context); void unity_webapps_context_on_interest_appeared (UnityWebappsContext *context,UnityWebappsContextNotifyCallback callback, -gpointer user_data); +gpointer user_data); void unity_webapps_context_on_interest_vanished (UnityWebappsContext *context,UnityWebappsContextNotifyCallback callback, -gpointer user_data); -gchar * unity_webapps_context_get_interest_owner +gpointer user_data); +gchar * unity_webapps_context_get_interest_owner (UnityWebappsContext *context, -gint interest_id); +gint interest_id); void unity_webapps_context_raise (UnityWebappsContext *context); void unity_webapps_context_raise_interest (UnityWebappsContext *context, -gint interest_id); +gint interest_id); void unity_webapps_context_close (UnityWebappsContext *context); void unity_webapps_context_close_interest (UnityWebappsContext *context, -gint interest_id); +gint interest_id); void unity_webapps_context_request_preview (UnityWebappsContext *context, -gint interest_id, +gint interest_id,UnityWebappsContextPreviewReadyCallback callback, -gpointer user_data); -gboolean unity_webapps_context_get_view_is_active +gpointer user_data); +gboolean unity_webapps_context_get_view_is_active (UnityWebappsContext *context, -gint interest_id); +gint interest_id); void unity_webapps_context_set_view_is_active (UnityWebappsContext *context, -gboolean active); +gboolean active); void unity_webapps_context_on_view_is_active_changed (UnityWebappsContext *context,UnityWebappsContextViewNotifyCallback callback, -gpointer user_data); -gchar * unity_webapps_context_get_view_location +gpointer user_data); +gchar * unity_webapps_context_get_view_location (UnityWebappsContext *context, -gint interest_id); +gint interest_id); void unity_webapps_context_set_view_location (UnityWebappsContext *context, -const gchar *location); +const gchar *location); void unity_webapps_context_on_view_location_changed (UnityWebappsContext *context,UnityWebappsContextLocationNotifyCallback callback, -gpointer user_data); +gpointer user_data); guint64 unity_webapps_context_get_view_window (UnityWebappsContext *context, -gint interest_id); +gint interest_id); void unity_webapps_context_set_view_window (UnityWebappsContext *context,guint64 window); void unity_webapps_context_on_view_window_changed (UnityWebappsContext *context,UnityWebappsContextWindowNotifyCallback callback, -gpointer user_data); +gpointer user_data); void unity_webapps_context_on_close_callback (UnityWebappsContext *context,UnityWebappsContextCloseCallback callback, -gpointer user_data); +gpointer user_data); void unity_webapps_context_on_raise_callback (UnityWebappsContext *context,UnityWebappsContextRaiseCallback callback, -gpointer user_data); +gpointer user_data); void unity_webapps_context_set_preview_requested_callback (UnityWebappsContext *context,UnityWebappsContextPreviewCallback callback, -gpointer user_data); +gpointer user_data); void unity_webapps_context_destroy (UnityWebappsContext *context, -gboolean user_abandoned); +gboolean user_abandoned); void (*UnityWebappsContextActionCallback) (UnityWebappsContext *context, -gpointer user_data); +gpointer user_data); void (*UnityWebappsContextLocationNotifyCallback) (UnityWebappsContext *Param1, -gint Param2, -const gchar *Param3, -gpointer Param4); +gint Param2, +const gchar *Param3, +gpointer Param4); void (*UnityWebappsContextNotifyCallback) (UnityWebappsContext *Param1, -gint Param2, -gpointer Param3); -const gchar * (*UnityWebappsContextPreviewCallback) +gint Param2, +gpointer Param3); +const gchar * (*UnityWebappsContextPreviewCallback) (UnityWebappsContext *context, -gpointer user_data); +gpointer user_data); void (*UnityWebappsContextPreviewReadyCallback) (UnityWebappsContext *context, -gint interest_id, -const gchar *preview_data, -gpointer user_data); +gint interest_id, +const gchar *preview_data, +gpointer user_data); void (*UnityWebappsContextRaiseCallback) (UnityWebappsContext *context, -const gchar *file, -gpointer user_data); +const gchar *file, +gpointer user_data); void (*UnityWebappsContextReadyCallback) (UnityWebappsContext *Param1, -gpointer user_data); +gpointer user_data); void (*UnityWebappsContextViewNotifyCallback) (UnityWebappsContext *Param1, -gint Param2, -gboolean Param3, -gpointer Param4); +gint Param2, +gboolean Param3, +gpointer Param4); void (*UnityWebappsContextWindowNotifyCallback) (UnityWebappsContext *Param1, -gint Param2, +gint Param2,guint64 Param3, -gpointer Param4); +gpointer Param4);
void unity_webapps_context_new (+UnityWebappsService *service, -const gchar *name, -const gchar *domain, -const gchar *icon_url, -const gchar *mime_types, +const gchar *name, +const gchar *domain, +const gchar *icon_url, +const gchar *mime_types,UnityWebappsContextReadyCallback callback, -gpointer user_data);
gpointer user_data);
UnityWebappsContext * unity_webapps_context_new_sync (+UnityWebappsService *service, -const gchar *name, -const gchar *domain, -const gchar *icon_url, -const gchar *mime_types);
const gchar *name,
+ const gchar *domain,
+ const gchar *icon_url,
+ const gchar *mime_types);
UnityWebappsContext * unity_webapps_context_new_for_context_name (+UnityWebappsService *service, -const gchar *context_name);
const gchar *context_name);
const gchar * unity_webapps_context_get_context_name +const gchar * unity_webapps_context_get_context_name (UnityWebappsContext *context);
const gchar * unity_webapps_context_get_name (UnityWebappsContext *context);
+const gchar * unity_webapps_context_get_name (UnityWebappsContext *context);
const gchar * unity_webapps_context_get_domain (UnityWebappsContext *context);
+const gchar * unity_webapps_context_get_domain (UnityWebappsContext *context);
const gchar * unity_webapps_context_get_desktop_name +const gchar * unity_webapps_context_get_desktop_name (UnityWebappsContext *context);
gchar * unity_webapps_context_get_icon_name (UnityWebappsContext *context);
+gchar * unity_webapps_context_get_icon_name (UnityWebappsContext *context);
void unity_webapps_context_add_icon (+UnityWebappsContext *context, -const gchar *url, -gint size);
const gchar *url,
+ gint size);
GVariant * unity_webapps_context_list_interests +GVariant * unity_webapps_context_list_interests (UnityWebappsContext *context);
void unity_webapps_context_on_interest_appeared (+UnityWebappsContext *context,UnityWebappsContextNotifyCallback callback, -gpointer user_data);
gpointer user_data);
void unity_webapps_context_on_interest_vanished (+UnityWebappsContext *context,UnityWebappsContextNotifyCallback callback, -gpointer user_data);
gpointer user_data);
gchar * unity_webapps_context_get_interest_owner +gchar * unity_webapps_context_get_interest_owner (+UnityWebappsContext *context, -gint interest_id);gint interest_id);
void unity_webapps_context_raise_interest (+UnityWebappsContext *context, -gint interest_id);
gint interest_id);
void unity_webapps_context_close_interest (+UnityWebappsContext *context, -gint interest_id);
gint interest_id);
void unity_webapps_context_request_preview (+UnityWebappsContext *context, -gint interest_id, +gint interest_id,UnityWebappsContextPreviewReadyCallback callback, -gpointer user_data);
gpointer user_data);
gboolean unity_webapps_context_get_view_is_active +gboolean unity_webapps_context_get_view_is_active (+UnityWebappsContext *context, -gint interest_id);gint interest_id);
void unity_webapps_context_set_view_is_active (+UnityWebappsContext *context, -gboolean active);
gboolean active);
void unity_webapps_context_on_view_is_active_changed (+UnityWebappsContext *context,UnityWebappsContextViewNotifyCallback callback, -gpointer user_data);
gpointer user_data);
gchar * unity_webapps_context_get_view_location +gchar * unity_webapps_context_get_view_location (+UnityWebappsContext *context, -gint interest_id);gint interest_id);
void unity_webapps_context_set_view_location (+UnityWebappsContext *context, -const gchar *location);
const gchar *location);
void unity_webapps_context_on_view_location_changed (+UnityWebappsContext *context,UnityWebappsContextLocationNotifyCallback callback, -gpointer user_data);
gpointer user_data);
guint64 unity_webapps_context_get_view_window (+UnityWebappsContext *context, -gint interest_id);
gint interest_id);
void unity_webapps_context_on_view_window_changed (+UnityWebappsContext *context,UnityWebappsContextWindowNotifyCallback callback, -gpointer user_data);
gpointer user_data);
void unity_webapps_context_on_close_callback (+UnityWebappsContext *context,UnityWebappsContextCloseCallback callback, -gpointer user_data);
gpointer user_data);
void unity_webapps_context_on_raise_callback (+UnityWebappsContext *context,UnityWebappsContextRaiseCallback callback, -gpointer user_data);
gpointer user_data);
void unity_webapps_context_set_preview_requested_callback (+UnityWebappsContext *context,UnityWebappsContextPreviewCallback callback, -gpointer user_data);
gpointer user_data);
void unity_webapps_context_destroy (+UnityWebappsContext *context, -gboolean user_abandoned);
gboolean user_abandoned);
void (*UnityWebappsContextActionCallback) (+UnityWebappsContext *context, -gpointer user_data);
gpointer user_data);
void (*UnityWebappsContextLocationNotifyCallback) (+UnityWebappsContext *Param1, -gint Param2, -const gchar *Param3, -gpointer Param4);
gint Param2,
+ const gchar *Param3,
+ gpointer Param4);
void (*UnityWebappsContextNotifyCallback) (+UnityWebappsContext *Param1, -gint Param2, -gpointer Param3);
gint Param2,
+ gpointer Param3);
const gchar * (*UnityWebappsContextPreviewCallback) +const gchar * (*UnityWebappsContextPreviewCallback) (+UnityWebappsContext *context, -gpointer user_data);gpointer user_data);
void (*UnityWebappsContextPreviewReadyCallback) (+UnityWebappsContext *context, -gint interest_id, -const gchar *preview_data, -gpointer user_data);
gint interest_id,
+ const gchar *preview_data,
+ gpointer user_data);
void (*UnityWebappsContextRaiseCallback) (+UnityWebappsContext *context, -const gchar *file, -gpointer user_data);
const gchar *file,
+ gpointer user_data);
void (*UnityWebappsContextReadyCallback) (+UnityWebappsContext *Param1, -gpointer user_data);
gpointer user_data);
void (*UnityWebappsContextViewNotifyCallback) (+UnityWebappsContext *Param1, -gint Param2, -gboolean Param3, -gpointer Param4);
gint Param2,
+ gboolean Param3,
+ gpointer Param4);
void (*UnityWebappsContextWindowNotifyCallback) (+UnityWebappsContext *Param1, -gint Param2, +gint Param2,guint64 Param3, -gpointer Param4);
gpointer Param4);
struct UnityWebappsService; struct UnityWebappsServiceClass; UnityWebappsService * unity_webapps_service_new (); -GDBusConnection * unity_webapps_service_get_connection +GDBusConnection * unity_webapps_service_get_connection (UnityWebappsService *service); -GDBusProxy * unity_webapps_service_get_proxy (UnityWebappsService *service); +GDBusProxy * unity_webapps_service_get_proxy (UnityWebappsService *service); void (*UnityWebappsServiceContextNotifyCallback) (UnityWebappsService *service, -const gchar *name, -gpointer user_data); +const gchar *name, +gpointer user_data); void unity_webapps_service_on_context_appeared (UnityWebappsService *service,UnityWebappsServiceContextNotifyCallback callback, -gpointer user_data); +gpointer user_data); void unity_webapps_service_on_context_vanished (UnityWebappsService *service,UnityWebappsServiceContextNotifyCallback callback, -gpointer user_data); -gchar ** unity_webapps_service_list_contexts (UnityWebappsService *service); +gpointer user_data); +gchar ** unity_webapps_service_list_contexts (UnityWebappsService *service); void unity_webapps_service_activate_application (UnityWebappsService *service, -const gchar *name, -const gchar *domain, -const gchar *const *files); +const gchar *name, +const gchar *domain, +const gchar *const *files);
GDBusConnection * unity_webapps_service_get_connection +GDBusConnection * unity_webapps_service_get_connection (UnityWebappsService *service);-Returns the GDBusConnection used by
service. +Returns the GDBusConnection used byservice.
@@ -122,7 +122,7 @@ @@ -131,9 +131,9 @@ - Returns :
The GDBusConnection used by service. [transfer none] +The GDBusConnection used by service. [transfer none]
unity_webapps_service_get_proxy ()
-GDBusProxy * unity_webapps_service_get_proxy (+UnityWebappsService *service);GDBusProxy * unity_webapps_service_get_proxy (UnityWebappsService *service);-Returns the internal GDBusProxy used by
service. +Returns the internal GDBusProxy used byservice.
@@ -144,7 +144,7 @@ @@ -155,8 +155,8 @@ - Returns :
The GDBusProxy used by service. [transfer none] +The GDBusProxy used by service. [transfer none]UnityWebappsServiceContextNotifyCallback ()
void (*UnityWebappsServiceContextNotifyCallback) (+UnityWebappsService *service, -const gchar *name, -gpointer user_data);const gchar *name, +gpointer user_data);
@@ -164,7 +164,7 @@diff -Nru libunity-webapps-2.3.3/src/Makefile.in libunity-webapps-2.3.5/src/Makefile.in --- libunity-webapps-2.3.3/src/Makefile.in 2012-09-19 13:29:33.383833259 +0000 +++ libunity-webapps-2.3.5/src/Makefile.in 2012-09-20 05:04:42.147494709 +0000 @@ -144,6 +144,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/src/context-daemon/Makefile.in libunity-webapps-2.3.5/src/context-daemon/Makefile.in --- libunity-webapps-2.3.3/src/context-daemon/Makefile.in 2012-09-19 13:29:33.511833263 +0000 +++ libunity-webapps-2.3.5/src/context-daemon/Makefile.in 2012-09-20 05:04:42.287494712 +0000 @@ -170,6 +170,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/src/index-updater/Makefile.in libunity-webapps-2.3.5/src/index-updater/Makefile.in --- libunity-webapps-2.3.3/src/index-updater/Makefile.in 2012-09-19 13:29:33.615833266 +0000 +++ libunity-webapps-2.3.5/src/index-updater/Makefile.in 2012-09-20 05:04:42.347494714 +0000 @@ -142,6 +142,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/src/libunity-webapps/Makefile.in libunity-webapps-2.3.5/src/libunity-webapps/Makefile.in --- libunity-webapps-2.3.3/src/libunity-webapps/Makefile.in 2012-09-19 13:29:33.839833274 +0000 +++ libunity-webapps-2.3.5/src/libunity-webapps/Makefile.in 2012-09-20 05:04:42.555494720 +0000 @@ -192,6 +192,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/src/libunity-webapps-repository/Makefile.in libunity-webapps-2.3.5/src/libunity-webapps-repository/Makefile.in --- libunity-webapps-2.3.3/src/libunity-webapps-repository/Makefile.in 2012-09-19 13:29:33.731833270 +0000 +++ libunity-webapps-2.3.5/src/libunity-webapps-repository/Makefile.in 2012-09-20 05:04:42.451494717 +0000 @@ -219,6 +219,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/src/runner/Makefile.am libunity-webapps-2.3.5/src/runner/Makefile.am --- libunity-webapps-2.3.3/src/runner/Makefile.am 2012-09-12 15:30:25.563379000 +0000 +++ libunity-webapps-2.3.5/src/runner/Makefile.am 2012-09-20 05:04:55.687495078 +0000 @@ -1,11 +1,16 @@ AM_CPPFLAGS = \ $(UNITY_WEBAPPS_CFLAGS) \ + $(GEOCLUE_CFLAGS) \ -I$(top_srcdir)/src/libunity-webapps bin_PROGRAMS = \ unity-webapps-runner unity_webapps_runner_SOURCES = \ - unity-webapps-runner.c + unity-webapps-runner.c \ + unity-webapps-runner-amazon.c \ + unity-webapps-runner-amazon.h -unity_webapps_runner_LDADD = $(UNITY_WEBAPPS_LIBS) ../libunity-webapps/libunity-webapps.la +unity_webapps_runner_LDADD = $(UNITY_WEBAPPS_LIBS) \ + $(GEOCLUE_LIBS) \ + ../libunity-webapps/libunity-webapps.la diff -Nru libunity-webapps-2.3.3/src/runner/Makefile.in libunity-webapps-2.3.5/src/runner/Makefile.in --- libunity-webapps-2.3.3/src/runner/Makefile.in 2012-09-19 13:29:33.891833275 +0000 +++ libunity-webapps-2.3.5/src/runner/Makefile.in 2012-09-20 05:06:18.803497346 +0000 @@ -64,11 +64,12 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) -am_unity_webapps_runner_OBJECTS = unity-webapps-runner.$(OBJEXT) +am_unity_webapps_runner_OBJECTS = unity-webapps-runner.$(OBJEXT) \ + unity-webapps-runner-amazon.$(OBJEXT) unity_webapps_runner_OBJECTS = $(am_unity_webapps_runner_OBJECTS) am__DEPENDENCIES_1 = unity_webapps_runner_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - ../libunity-webapps/libunity-webapps.la + $(am__DEPENDENCIES_1) ../libunity-webapps/libunity-webapps.la AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -138,6 +139,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ @@ -287,12 +290,18 @@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = \ $(UNITY_WEBAPPS_CFLAGS) \ + $(GEOCLUE_CFLAGS) \ -I$(top_srcdir)/src/libunity-webapps unity_webapps_runner_SOURCES = \ - unity-webapps-runner.c + unity-webapps-runner.c \ + unity-webapps-runner-amazon.c \ + unity-webapps-runner-amazon.h + +unity_webapps_runner_LDADD = $(UNITY_WEBAPPS_LIBS) \ + $(GEOCLUE_LIBS) \ + ../libunity-webapps/libunity-webapps.la -unity_webapps_runner_LDADD = $(UNITY_WEBAPPS_LIBS) ../libunity-webapps/libunity-webapps.la all: all-am .SUFFIXES: @@ -383,6 +392,7 @@ distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unity-webapps-runner-amazon.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unity-webapps-runner.Po@am__quote@ .c.o: diff -Nru libunity-webapps-2.3.3/src/runner/unity-webapps-runner-amazon.c libunity-webapps-2.3.5/src/runner/unity-webapps-runner-amazon.c --- libunity-webapps-2.3.3/src/runner/unity-webapps-runner-amazon.c 1970-01-01 00:00:00.000000000 +0000 +++ libunity-webapps-2.3.5/src/runner/unity-webapps-runner-amazon.c 2012-09-20 05:04:13.113266000 +0000 @@ -0,0 +1,128 @@ +#include "unity-webapps-runner-amazon.h" +#includevoid unity_webapps_service_on_context_appeared (+UnityWebappsService *service,UnityWebappsServiceContextNotifyCallback callback, -gpointer user_data);gpointer user_data);Registers
callbackto be invoked when the "ContextAppeared" signal is emitted from the remote service instance. This indicates a new application context has come online. @@ -193,7 +193,7 @@void unity_webapps_service_on_context_vanished (+UnityWebappsService *service,UnityWebappsServiceContextNotifyCallback callback, -gpointer user_data);gpointer user_data);Registers
callbackto be invoked when the "ContextVanished" signal is emitted from the remote service instance. This indicates an application context has gone offline. @@ -219,7 +219,7 @@
diff -Nru libunity-webapps-2.3.3/docs/reference/libunity-webapps/html/libunity-webapps-unity-webapps-launcher-context.html libunity-webapps-2.3.5/docs/reference/libunity-webapps/html/libunity-webapps-unity-webapps-launcher-context.html --- libunity-webapps-2.3.3/docs/reference/libunity-webapps/html/libunity-webapps-unity-webapps-launcher-context.html 2012-09-19 13:30:24.159834929 +0000 +++ libunity-webapps-2.3.5/docs/reference/libunity-webapps/html/libunity-webapps-unity-webapps-launcher-context.html 2012-09-20 05:06:47.487498128 +0000 @@ -38,23 +38,23 @@unity_webapps_service_list_contexts ()
-gchar ** unity_webapps_service_list_contexts (+UnityWebappsService *service);gchar ** unity_webapps_service_list_contexts (UnityWebappsService *service);Returns a list of context names (unique DBus names), registered with the remote service. @@ -244,9 +244,9 @@
unity_webapps_service_activate_application ()
void unity_webapps_service_activate_application (+UnityWebappsService *service, -const gchar *name, -const gchar *domain, -const gchar *const *files);const gchar *name, +const gchar *domain, +const gchar *const *files);Invokes the ActivateApplication method of the UnityWebappsService object. This will activate the application uniquely idenfied by the pair (
name,domain). diff -Nru libunity-webapps-2.3.3/docs/reference/libunity-webapps/html/libunity-webapps-unity-webapps-indicator-context.html libunity-webapps-2.3.5/docs/reference/libunity-webapps/html/libunity-webapps-unity-webapps-indicator-context.html --- libunity-webapps-2.3.3/docs/reference/libunity-webapps/html/libunity-webapps-unity-webapps-indicator-context.html 2012-09-19 13:30:24.151834928 +0000 +++ libunity-webapps-2.3.5/docs/reference/libunity-webapps/html/libunity-webapps-unity-webapps-indicator-context.html 2012-09-20 05:06:47.487498128 +0000 @@ -38,44 +38,44 @@Synopsis
void (*UnityWebappsIndicatorCallback) (UnityWebappsContext *context, -gpointer user_data); +gpointer user_data); UnityWebappsIndicatorContext; void unity_webapps_indicator_add_action (UnityWebappsContext *context, -const gchar *label, +const gchar *label,UnityWebappsIndicatorCallback callback, -gpointer user_data); +gpointer user_data); void unity_webapps_indicator_clear_indicator (UnityWebappsContext *context, -const gchar *name); +const gchar *name); void unity_webapps_indicator_context_free (UnityWebappsIndicatorContext *context); UnityWebappsIndicatorContext * unity_webapps_indicator_context_new (UnityWebappsContext *main_context, -GError **error); -gchar * unity_webapps_indicator_get_presence +GError **error); +gchar * unity_webapps_indicator_get_presence (UnityWebappsContext *context); void unity_webapps_indicator_on_presence_changed_callback (UnityWebappsContext *context,UnityWebappsIndicatorCallback callback, -gpointer user_data); +gpointer user_data); void unity_webapps_indicator_set_callback (UnityWebappsContext *context, -const gchar *name, +const gchar *name,UnityWebappsIndicatorCallback callback, -gpointer user_data); +gpointer user_data); void unity_webapps_indicator_set_property (UnityWebappsContext *context, -const gchar *name, -const gchar *property, -const gchar *value); +const gchar *name, +const gchar *property, +const gchar *value); void unity_webapps_indicator_set_property_icon (UnityWebappsContext *context, -const gchar *name, -const gchar *property, -const gchar *icon_url); +const gchar *name, +const gchar *property, +const gchar *icon_url); void unity_webapps_indicator_show_indicator (UnityWebappsContext *context, -const gchar *name); +const gchar *name);@@ -86,7 +86,7 @@UnityWebappsIndicatorCallback ()
void (*UnityWebappsIndicatorCallback) (+UnityWebappsContext *context, -gpointer user_data);gpointer user_data);
@@ -107,16 +107,16 @@unity_webapps_indicator_add_action ()
void unity_webapps_indicator_add_action (+UnityWebappsContext *context, -const gchar *label, +const gchar *label,UnityWebappsIndicatorCallback callback, -gpointer user_data);gpointer user_data);
unity_webapps_indicator_clear_indicator ()
void unity_webapps_indicator_clear_indicator (+UnityWebappsContext *context, -const gchar *name);const gchar *name);
@@ -129,12 +129,12 @@unity_webapps_indicator_context_new ()
UnityWebappsIndicatorContext * unity_webapps_indicator_context_new (+UnityWebappsContext *main_context, -GError **error);GError **error);
unity_webapps_indicator_get_presence ()
-gchar * unity_webapps_indicator_get_presence +gchar * unity_webapps_indicator_get_presence (UnityWebappsContext *context);
@@ -143,41 +143,41 @@void unity_webapps_indicator_on_presence_changed_callback (+UnityWebappsContext *context,UnityWebappsIndicatorCallback callback, -gpointer user_data);gpointer user_data);
unity_webapps_indicator_set_callback ()
void unity_webapps_indicator_set_callback (+UnityWebappsContext *context, -const gchar *name, +const gchar *name,UnityWebappsIndicatorCallback callback, -gpointer user_data);gpointer user_data);
unity_webapps_indicator_set_property ()
void unity_webapps_indicator_set_property (+UnityWebappsContext *context, -const gchar *name, -const gchar *property, -const gchar *value);const gchar *name, +const gchar *property, +const gchar *value);
unity_webapps_indicator_set_property_icon ()
void unity_webapps_indicator_set_property_icon (+UnityWebappsContext *context, -const gchar *name, -const gchar *property, -const gchar *icon_url);const gchar *name, +const gchar *property, +const gchar *icon_url);
unity_webapps_indicator_show_indicator ()
void unity_webapps_indicator_show_indicator (+UnityWebappsContext *context, -const gchar *name);const gchar *name);@@ -66,7 +66,7 @@Synopsis
void (*UnityWebappsLauncherCallback) (UnityWebappsContext *context, -gpointer user_data); +gpointer user_data); UnityWebappsLauncherContext; void unity_webapps_launcher_add_action (UnityWebappsContext *context, -const gchar *label, +const gchar *label,UnityWebappsLauncherCallback callback, -gpointer user_data); +gpointer user_data); void unity_webapps_launcher_clear_count (UnityWebappsContext *context); void unity_webapps_launcher_clear_progress (UnityWebappsContext *context); void unity_webapps_launcher_context_free (UnityWebappsLauncherContext *context); UnityWebappsLauncherContext * unity_webapps_launcher_context_new (UnityWebappsContext *main_context, -GError **error); +GError **error); void unity_webapps_launcher_set_count (UnityWebappsContext *context, -gint count); +gint count); void unity_webapps_launcher_set_progress (UnityWebappsContext *context, -gdouble progress); +gdouble progress); void unity_webapps_launcher_set_urgent (UnityWebappsContext *context);UnityWebappsLauncherCallback ()
void (*UnityWebappsLauncherCallback) (+UnityWebappsContext *context, -gpointer user_data);gpointer user_data);
@@ -84,9 +84,9 @@unity_webapps_launcher_add_action ()
void unity_webapps_launcher_add_action (+UnityWebappsContext *context, -const gchar *label, +const gchar *label,UnityWebappsLauncherCallback callback, -gpointer user_data);gpointer user_data);
@@ -109,19 +109,19 @@unity_webapps_launcher_context_new ()
UnityWebappsLauncherContext * unity_webapps_launcher_context_new (+UnityWebappsContext *main_context, -GError **error);GError **error);
unity_webapps_launcher_set_count ()
void unity_webapps_launcher_set_count (+UnityWebappsContext *context, -gint count);gint count);
unity_webapps_launcher_set_progress ()
void unity_webapps_launcher_set_progress (+UnityWebappsContext *context, -gdouble progress);gdouble progress);
diff -Nru libunity-webapps-2.3.3/docs/reference/libunity-webapps/html/libunity-webapps-unity-webapps-music-player-context.html libunity-webapps-2.3.5/docs/reference/libunity-webapps/html/libunity-webapps-unity-webapps-music-player-context.html --- libunity-webapps-2.3.3/docs/reference/libunity-webapps/html/libunity-webapps-unity-webapps-music-player-context.html 2012-09-19 13:30:24.155834928 +0000 +++ libunity-webapps-2.3.5/docs/reference/libunity-webapps/html/libunity-webapps-unity-webapps-music-player-context.html 2012-09-20 05:06:47.503498129 +0000 @@ -38,59 +38,59 @@diff -Nru libunity-webapps-2.3.3/docs/reference/libunity-webapps/html/libunity-webapps-unity-webapps-notification-context.html libunity-webapps-2.3.5/docs/reference/libunity-webapps/html/libunity-webapps-unity-webapps-notification-context.html --- libunity-webapps-2.3.3/docs/reference/libunity-webapps/html/libunity-webapps-unity-webapps-notification-context.html 2012-09-19 13:30:24.151834928 +0000 +++ libunity-webapps-2.3.5/docs/reference/libunity-webapps/html/libunity-webapps-unity-webapps-notification-context.html 2012-09-20 05:06:47.499498129 +0000 @@ -42,12 +42,12 @@ (Synopsis
void (*UnityWebappsMusicPlayerCallback) (UnityWebappsContext *context, -gpointer user_data); +gpointer user_data); UnityWebappsMusicPlayerContext; enum UnityWebappsMusicPlayerPlaybackState; void unity_webapps_music_player_context_free (UnityWebappsMusicPlayerContext *context); UnityWebappsMusicPlayerContext * unity_webapps_music_player_context_new (UnityWebappsContext *main_context, -GError **error); -gboolean unity_webapps_music_player_get_can_go_next +GError **error); +gboolean unity_webapps_music_player_get_can_go_next (UnityWebappsContext *context); -gboolean unity_webapps_music_player_get_can_go_previous +gboolean unity_webapps_music_player_get_can_go_previous (UnityWebappsContext *context); -gboolean unity_webapps_music_player_get_can_pause +gboolean unity_webapps_music_player_get_can_pause (UnityWebappsContext *context); -gboolean unity_webapps_music_player_get_can_play +gboolean unity_webapps_music_player_get_can_play (UnityWebappsContext *context); UnityWebappsMusicPlayerPlaybackState unity_webapps_music_player_get_playback_state (UnityWebappsContext *context); void unity_webapps_music_player_init (UnityWebappsContext *context, -const gchar *title); +const gchar *title); void unity_webapps_music_player_on_next_callback (UnityWebappsContext *context,UnityWebappsMusicPlayerCallback callback, -gpointer user_data); +gpointer user_data); void unity_webapps_music_player_on_play_pause_callback (UnityWebappsContext *context,UnityWebappsMusicPlayerCallback callback, -gpointer user_data); +gpointer user_data); void unity_webapps_music_player_on_previous_callback (UnityWebappsContext *context,UnityWebappsMusicPlayerCallback callback, -gpointer user_data); +gpointer user_data); void unity_webapps_music_player_set_can_go_next (UnityWebappsContext *context, -gboolean can_go_next); +gboolean can_go_next); void unity_webapps_music_player_set_can_go_previous (UnityWebappsContext *context, -gboolean can_go_previous); +gboolean can_go_previous); void unity_webapps_music_player_set_can_pause (UnityWebappsContext *context, -gboolean can_go_pause); +gboolean can_go_pause); void unity_webapps_music_player_set_can_play (UnityWebappsContext *context, -gboolean can_go_play); +gboolean can_go_play); void unity_webapps_music_player_set_playback_state (UnityWebappsContext *context,UnityWebappsMusicPlayerPlaybackState state); void unity_webapps_music_player_set_track (UnityWebappsContext *context, -const gchar *artist, -const gchar *album, -const gchar *title, -const gchar *icon_url); +const gchar *artist, +const gchar *album, +const gchar *title, +const gchar *icon_url);@@ -101,7 +101,7 @@UnityWebappsMusicPlayerCallback ()
void (*UnityWebappsMusicPlayerCallback) (+UnityWebappsContext *context, -gpointer user_data);gpointer user_data);
@@ -134,30 +134,30 @@unity_webapps_music_player_context_new ()
UnityWebappsMusicPlayerContext * unity_webapps_music_player_context_new (+UnityWebappsContext *main_context, -GError **error);GError **error);
unity_webapps_music_player_get_can_go_next ()
-gboolean unity_webapps_music_player_get_can_go_next +gboolean unity_webapps_music_player_get_can_go_next (UnityWebappsContext *context);
unity_webapps_music_player_get_can_go_previous ()
-gboolean unity_webapps_music_player_get_can_go_previous +gboolean unity_webapps_music_player_get_can_go_previous (UnityWebappsContext *context);
unity_webapps_music_player_get_can_pause ()
-gboolean unity_webapps_music_player_get_can_pause +gboolean unity_webapps_music_player_get_can_pause (UnityWebappsContext *context);
unity_webapps_music_player_get_can_play ()
-gboolean unity_webapps_music_player_get_can_play +gboolean unity_webapps_music_player_get_can_play (UnityWebappsContext *context);
@@ -170,7 +170,7 @@unity_webapps_music_player_init ()
void unity_webapps_music_player_init (+UnityWebappsContext *context, -const gchar *title);const gchar *title);
@@ -178,7 +178,7 @@void unity_webapps_music_player_on_next_callback (+UnityWebappsContext *context,UnityWebappsMusicPlayerCallback callback, -gpointer user_data);gpointer user_data);
@@ -186,7 +186,7 @@void unity_webapps_music_player_on_play_pause_callback (+UnityWebappsContext *context,UnityWebappsMusicPlayerCallback callback, -gpointer user_data);gpointer user_data);
@@ -194,35 +194,35 @@void unity_webapps_music_player_on_previous_callback (+UnityWebappsContext *context,UnityWebappsMusicPlayerCallback callback, -gpointer user_data);gpointer user_data);
unity_webapps_music_player_set_can_go_next ()
void unity_webapps_music_player_set_can_go_next (+UnityWebappsContext *context, -gboolean can_go_next);gboolean can_go_next);
unity_webapps_music_player_set_can_go_previous ()
void unity_webapps_music_player_set_can_go_previous (+UnityWebappsContext *context, -gboolean can_go_previous);gboolean can_go_previous);
unity_webapps_music_player_set_can_pause ()
void unity_webapps_music_player_set_can_pause (+UnityWebappsContext *context, -gboolean can_go_pause);gboolean can_go_pause);
unity_webapps_music_player_set_can_play ()
void unity_webapps_music_player_set_can_play (+UnityWebappsContext *context, -gboolean can_go_play);gboolean can_go_play);
@@ -236,10 +236,10 @@unity_webapps_music_player_set_track ()
void unity_webapps_music_player_set_track (+UnityWebappsContext *context, -const gchar *artist, -const gchar *album, -const gchar *title, -const gchar *icon_url);const gchar *artist, +const gchar *album, +const gchar *title, +const gchar *icon_url);UnityWebappsNotificationContext *context); UnityWebappsNotificationContext * unity_webapps_notification_context_new (UnityWebappsContext *main_context, -GError **error); +GError **error); void unity_webapps_notification_show_notification (UnityWebappsContext *context, -const gchar *summary, -const gchar *body, -const gchar *icon_url); +const gchar *summary, +const gchar *body, +const gchar *icon_url);@@ -76,16 +76,16 @@unity_webapps_notification_context_new ()
UnityWebappsNotificationContext * unity_webapps_notification_context_new (+UnityWebappsContext *main_context, -GError **error);GError **error);
unity_webapps_notification_show_notification ()
void unity_webapps_notification_show_notification (+UnityWebappsContext *context, -const gchar *summary, -const gchar *body, -const gchar *icon_url);const gchar *summary, +const gchar *body, +const gchar *icon_url);+#include + +#define UBUNTU_GEOIP_PROVIDER_SERVICE "org.freedesktop.Geoclue.Providers.UbuntuGeoIP" +#define UBUNTU_GEOIP_PROVIDER_PATH "/org/freedesktop/Geoclue/Providers/UbuntuGeoIP" + +#define DEFAULT_AMAZON_DESKTOP "ubuntu-amazon-default.desktop" + +gchar * +unity_webapps_runner_amazon_get_country (void) +{ + GeoclueAddress *address; + GeoclueAccuracy * accuracy; + GeoclueAccuracyLevel level; + GHashTable *address_details; + gchar *country; + gboolean got_address; + GError *error; + + address = geoclue_address_new (UBUNTU_GEOIP_PROVIDER_SERVICE, + UBUNTU_GEOIP_PROVIDER_PATH); + + error = NULL; + country = NULL; + accuracy = NULL; + + got_address = geoclue_address_get_address (address, NULL, &address_details, &accuracy, &error); + if (got_address == FALSE) + { + g_warning ("Failed to fetch address from Geoclue: %s", error->message); + g_error_free (error); + goto out; + } + + geoclue_accuracy_get_details(accuracy, &level, NULL, NULL); + if (GEOCLUE_ACCURACY_LEVEL_NONE == level) + { + g_warning ("Could not get a proper accuracy from Geoclue (NONE)"); + g_hash_table_destroy (address_details); + goto out; + } + + country = g_strdup (g_hash_table_lookup (address_details, "country")); + g_hash_table_destroy (address_details); + + out: + geoclue_accuracy_free(accuracy); + g_object_unref (G_OBJECT (address)); + return country; +} + +static GHashTable * +unity_webapps_runner_amazon_get_desktops_by_country () +{ + GHashTable *desktops_by_country; + + desktops_by_country = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL); + + g_hash_table_insert (desktops_by_country, "Canada", "http://amazon.ca"); + g_hash_table_insert (desktops_by_country, "China", "http://amazon.cn"); + g_hash_table_insert (desktops_by_country, "United Kingdom", "http://amazon.co.uk"); + g_hash_table_insert (desktops_by_country, "France", "http://amazon.fr"); + g_hash_table_insert (desktops_by_country, "Italy", "http://amazon.it"); + g_hash_table_insert (desktops_by_country, "Spain", "http://amazon.es"); + g_hash_table_insert (desktops_by_country, "Germany", "http://amazon.de"); + + return desktops_by_country; +} + +const gchar * +unity_webapps_runner_amazon_get_homepage_for_country (const gchar *country) +{ + static const gchar * DEFAULT_AMAZON_URL = "http://www.amazon.com"; + static GHashTable *desktops_by_country = NULL; + const gchar *ret; + + if (desktops_by_country == NULL) + { + desktops_by_country = unity_webapps_runner_amazon_get_desktops_by_country (); + } + + if (country == NULL) + { + return DEFAULT_AMAZON_URL; + } + + ret = g_hash_table_lookup (desktops_by_country, country); + if (ret == NULL) + { + return DEFAULT_AMAZON_URL; + } + return ret; +} + +static void +filter_settings_strv (GSettings *settings, const gchar *key, const gchar *str) +{ + gchar **it1, **it2; + gchar **strv = g_settings_get_strv(settings, key); + + for (it1 = strv, it2 = strv; it2 && *it2; it2++) + { + if (g_strcmp0 (*it2, str) != 0) + { + *it1 = *it2; + it1++; + } + } + *it1 = NULL; + + g_settings_set_strv (settings, key, (const gchar *const *)strv); + g_strfreev (strv); +} + +gboolean +unity_webapps_runner_amazon_unpin_default_launcher () +{ + GSettings *settings; + + settings = g_settings_new ("com.canonical.Unity.Launcher"); + + filter_settings_strv (settings, "favorites", DEFAULT_AMAZON_DESKTOP); + + g_object_unref (G_OBJECT (settings)); + + return TRUE; +} diff -Nru libunity-webapps-2.3.3/src/runner/unity-webapps-runner-amazon.h libunity-webapps-2.3.5/src/runner/unity-webapps-runner-amazon.h --- libunity-webapps-2.3.3/src/runner/unity-webapps-runner-amazon.h 1970-01-01 00:00:00.000000000 +0000 +++ libunity-webapps-2.3.5/src/runner/unity-webapps-runner-amazon.h 2012-09-20 05:04:13.113266000 +0000 @@ -0,0 +1,7 @@ +#ifndef __UNITY_WEBAPPS_RUNNER_AMAZON_H +#define __UNITY_WEBAPPS_RUNNER_AMAZON_H +#include +gchar *unity_webapps_runner_amazon_get_country (void); +const gchar *unity_webapps_runner_amazon_get_homepage_for_country (const gchar *country); +gboolean unity_webapps_runner_amazon_unpin_default_launcher (); +#endif diff -Nru libunity-webapps-2.3.3/src/runner/unity-webapps-runner.c libunity-webapps-2.3.5/src/runner/unity-webapps-runner.c --- libunity-webapps-2.3.3/src/runner/unity-webapps-runner.c 2012-08-02 19:51:24.904520000 +0000 +++ libunity-webapps-2.3.5/src/runner/unity-webapps-runner.c 2012-09-20 05:04:13.113266000 +0000 @@ -23,17 +23,20 @@ #include "unity-webapps-service.h" #include "unity-webapps-context.h" +#include "unity-webapps-runner-amazon.h" static UnityWebappsService *service = NULL; static gchar *name = NULL; static gchar *domain = NULL; +static gboolean amazon = FALSE; GMainLoop *loop = NULL; static GOptionEntry option_entries[] = { { "name", 'n',0,G_OPTION_ARG_STRING, &name, "Application name", NULL }, - { "domain", 'd',0, G_OPTION_ARG_STRING, &domain, "Application domain", NULL} + { "domain", 'd',0, G_OPTION_ARG_STRING, &domain, "Application domain", NULL}, + { "amazon", 'a',0, G_OPTION_ARG_NONE, &amazon, "Launch amazon (with geoclue store selection)", NULL} }; gboolean @@ -98,6 +101,43 @@ printf("Failed to parse arguments: %s\n", error->message); exit(1); } + + if (amazon == TRUE) + { + GError *spawn_error; + gchar *command_line; + gchar *country; + const gchar *url; + + spawn_error = NULL; + + country = unity_webapps_runner_amazon_get_country (); + + url = unity_webapps_runner_amazon_get_homepage_for_country (country); + if (NULL == url) + { + g_error("Could not retrieve the url associated with the current country %s", country); + return 1; + } + command_line = g_strdup_printf("xdg-open '%s'", url); + + g_spawn_command_line_async (command_line, &spawn_error); + if (spawn_error != NULL) + { + g_error ("Error spawning browser: %s", spawn_error->message); + g_error_free (spawn_error); + g_free (country); + return 1; + } + + // We should delay this until the amazon context appears. + // Even then it's questionable! Bug fix ;) + unity_webapps_runner_amazon_unpin_default_launcher (); + + g_free (command_line); + g_free (country); + return 0; + } g_base64_decode_inplace (name, &len); diff -Nru libunity-webapps-2.3.3/src/unity-webapps-gen-context.c libunity-webapps-2.3.5/src/unity-webapps-gen-context.c --- libunity-webapps-2.3.3/src/unity-webapps-gen-context.c 2012-08-02 19:51:50.792641131 +0000 +++ libunity-webapps-2.3.5/src/unity-webapps-gen-context.c 2012-09-20 05:05:52.735496635 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.6. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru libunity-webapps-2.3.3/src/unity-webapps-gen-context.h libunity-webapps-2.3.5/src/unity-webapps-gen-context.h --- libunity-webapps-2.3.3/src/unity-webapps-gen-context.h 2012-08-02 19:51:50.792641131 +0000 +++ libunity-webapps-2.3.5/src/unity-webapps-gen-context.h 2012-09-20 05:05:52.735496635 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.6. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru libunity-webapps-2.3.3/src/unity-webapps-gen-indicator.c libunity-webapps-2.3.5/src/unity-webapps-gen-indicator.c --- libunity-webapps-2.3.3/src/unity-webapps-gen-indicator.c 2012-08-02 19:51:50.964641137 +0000 +++ libunity-webapps-2.3.5/src/unity-webapps-gen-indicator.c 2012-09-20 05:05:52.935496640 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.6. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru libunity-webapps-2.3.3/src/unity-webapps-gen-indicator.h libunity-webapps-2.3.5/src/unity-webapps-gen-indicator.h --- libunity-webapps-2.3.3/src/unity-webapps-gen-indicator.h 2012-08-02 19:51:50.964641137 +0000 +++ libunity-webapps-2.3.5/src/unity-webapps-gen-indicator.h 2012-09-20 05:05:52.935496640 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.6. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru libunity-webapps-2.3.3/src/unity-webapps-gen-launcher.c libunity-webapps-2.3.5/src/unity-webapps-gen-launcher.c --- libunity-webapps-2.3.3/src/unity-webapps-gen-launcher.c 2012-08-02 19:51:51.112641142 +0000 +++ libunity-webapps-2.3.5/src/unity-webapps-gen-launcher.c 2012-09-20 05:05:52.979496641 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.6. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru libunity-webapps-2.3.3/src/unity-webapps-gen-launcher.h libunity-webapps-2.3.5/src/unity-webapps-gen-launcher.h --- libunity-webapps-2.3.3/src/unity-webapps-gen-launcher.h 2012-08-02 19:51:51.112641142 +0000 +++ libunity-webapps-2.3.5/src/unity-webapps-gen-launcher.h 2012-09-20 05:05:52.979496641 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.6. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru libunity-webapps-2.3.3/src/unity-webapps-gen-music-player.c libunity-webapps-2.3.5/src/unity-webapps-gen-music-player.c --- libunity-webapps-2.3.3/src/unity-webapps-gen-music-player.c 2012-08-02 19:51:51.044641139 +0000 +++ libunity-webapps-2.3.5/src/unity-webapps-gen-music-player.c 2012-09-20 05:05:52.827496637 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.6. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru libunity-webapps-2.3.3/src/unity-webapps-gen-music-player.h libunity-webapps-2.3.5/src/unity-webapps-gen-music-player.h --- libunity-webapps-2.3.3/src/unity-webapps-gen-music-player.h 2012-08-02 19:51:51.044641139 +0000 +++ libunity-webapps-2.3.5/src/unity-webapps-gen-music-player.h 2012-09-20 05:05:52.831496637 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.6. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru libunity-webapps-2.3.3/src/unity-webapps-gen-notification.c libunity-webapps-2.3.5/src/unity-webapps-gen-notification.c --- libunity-webapps-2.3.3/src/unity-webapps-gen-notification.c 2012-08-02 19:51:50.876641134 +0000 +++ libunity-webapps-2.3.5/src/unity-webapps-gen-notification.c 2012-09-20 05:05:52.659496633 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.6. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru libunity-webapps-2.3.3/src/unity-webapps-gen-notification.h libunity-webapps-2.3.5/src/unity-webapps-gen-notification.h --- libunity-webapps-2.3.3/src/unity-webapps-gen-notification.h 2012-08-02 19:51:50.876641134 +0000 +++ libunity-webapps-2.3.5/src/unity-webapps-gen-notification.h 2012-09-20 05:05:52.659496633 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.6. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru libunity-webapps-2.3.3/src/unity-webapps-gen-service.c libunity-webapps-2.3.5/src/unity-webapps-gen-service.c --- libunity-webapps-2.3.3/src/unity-webapps-gen-service.c 2012-08-02 19:51:50.684641128 +0000 +++ libunity-webapps-2.3.5/src/unity-webapps-gen-service.c 2012-09-20 05:05:52.655496632 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.6. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru libunity-webapps-2.3.3/src/unity-webapps-gen-service.h libunity-webapps-2.3.5/src/unity-webapps-gen-service.h --- libunity-webapps-2.3.3/src/unity-webapps-gen-service.h 2012-08-02 19:51:50.684641128 +0000 +++ libunity-webapps-2.3.5/src/unity-webapps-gen-service.h 2012-09-20 05:05:52.655496632 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.6. DO NOT EDIT. + * Generated by gdbus-codegen 2.33.12. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru libunity-webapps-2.3.3/src/webapps-service/Makefile.in libunity-webapps-2.3.5/src/webapps-service/Makefile.in --- libunity-webapps-2.3.3/src/webapps-service/Makefile.in 2012-09-19 13:29:33.963833278 +0000 +++ libunity-webapps-2.3.5/src/webapps-service/Makefile.in 2012-09-20 05:04:42.663494723 +0000 @@ -142,6 +142,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/src/webapps-service/unity-webapps-service.c libunity-webapps-2.3.5/src/webapps-service/unity-webapps-service.c --- libunity-webapps-2.3.3/src/webapps-service/unity-webapps-service.c 2012-09-12 15:30:25.563379000 +0000 +++ libunity-webapps-2.3.5/src/webapps-service/unity-webapps-service.c 2012-09-20 05:04:13.113266000 +0000 @@ -722,89 +722,106 @@ } static GFile* -_firefox_profile_get_location (GKeyFile *profiles, - GFile *dir, - const gchar *name) +_firefox_webapps_profile_get_location (GFile *profiles, + const gchar *id) { - gchar **i; - GFile *res = FALSE; - gchar **groups = g_key_file_get_groups (profiles, NULL); + GFile *res = NULL; + gchar *profiles_path = g_file_get_path (profiles); - for (i = groups; i && *i && !res; i++) - { - gchar *gname = g_key_file_get_string (profiles, *i, "Name", NULL); + GDir *dir = g_dir_open (profiles_path, 0, NULL); - if (g_strcmp0 (name, gname) == 0) + if (dir) + { + for (const gchar *name = g_dir_read_name (dir); name; name = g_dir_read_name (dir)) { - gchar *path = g_key_file_get_string (profiles, *i, "Path", NULL); - if (g_key_file_get_integer (profiles, *i, "IsRelative", NULL)) - { - res = g_file_get_child (dir, path); - } - else - { - res = g_file_new_for_path (path); - } - - g_free (path); - - if (g_file_query_file_type (res, G_FILE_QUERY_INFO_NONE, NULL) != G_FILE_TYPE_DIRECTORY) + if (g_str_has_suffix (name, id)) { - g_object_unref (res); - res = NULL; + res = g_file_get_child (profiles, name); + if (g_file_query_file_type (res, G_FILE_QUERY_INFO_NONE, NULL) != G_FILE_TYPE_DIRECTORY) + { + g_object_unref (res); + res = NULL; + } + else + { + break; + } } } - g_free (gname); + + g_dir_close (dir); } - g_strfreev (groups); + + g_free (profiles_path); return res; } -static gchar* -_firefox_profile_get_default (GKeyFile *profiles) +static GFile* +_firefox_default_profile_get_location (GFile *dir) { gchar **i; - gchar *res = NULL; - gchar **groups = g_key_file_get_groups (profiles, NULL); + GFile *res = NULL; - for (i = groups; i && *i && !res; i++) + GFile *profiles_file = g_file_get_child (dir, "profiles.ini"); + GKeyFile *profiles = g_key_file_new (); + gchar *profiles_file_path = g_file_get_path (profiles_file); + if (g_key_file_load_from_file (profiles, profiles_file_path, G_KEY_FILE_NONE, NULL)) { - if (g_str_has_prefix (*i, "Profile")) + gchar **groups = g_key_file_get_groups (profiles, NULL); + + for (i = groups; i && *i && !res; i++) { - if (g_key_file_get_integer (profiles, *i, "Default", NULL)) + if (g_str_has_prefix (*i, "Profile")) { - res = g_key_file_get_string (profiles, *i, "Name", NULL); - break; + if (g_key_file_get_integer (profiles, *i, "Default", NULL)) + { + gchar *path = g_key_file_get_string (profiles, *i, "Path", NULL); + if (g_key_file_get_integer (profiles, *i, "IsRelative", NULL)) + { + res = g_file_get_child (dir, path); + } + else + { + res = g_file_new_for_path (path); + } + + g_free (path); + if (g_file_query_file_type (res, G_FILE_QUERY_INFO_NONE, NULL) != G_FILE_TYPE_DIRECTORY) + { + g_object_unref (res); + res = NULL; + } + + break; + } } } + g_strfreev (groups); } - g_strfreev (groups); + + g_free (profiles_file_path); + g_key_file_unref (profiles); + g_object_unref (profiles_file); return res; } static gboolean -_firefox_profile_create (GKeyFile *profiles, - const gchar *id, - GFile *dir, - GFile *profiles_file) +_firefox_profile_create (const gchar *id, + GFile *dir) { gboolean res = FALSE; GFile *default_dir = NULL; gchar *default_extensions_path = NULL; - gchar *res_group_name = NULL, *default_dir_path = NULL; - gchar *res_dir_name = NULL, *default_profile_name = NULL, *res_dir_path = NULL; + gchar *default_dir_path = NULL; + gchar *res_dir_name = NULL, *res_dir_path = NULL; - default_profile_name = _firefox_profile_get_default (profiles); - - if (!default_profile_name) - goto out; - - default_dir = _firefox_profile_get_location (profiles, dir, default_profile_name); + default_dir = _firefox_default_profile_get_location (dir); if (!default_dir) goto out; + default_dir_path = g_file_get_path (default_dir); res_dir_name = g_strdup_printf ("%d.%s", g_random_int() % 10000000, id); @@ -827,25 +844,7 @@ create_link (cookies, "/cookies.sqlite"); - gint i = 0; - do - { - i++; - if (res_group_name) - g_free (res_group_name); - res_group_name = g_strdup_printf ("Profile%d", i); - } - while (g_key_file_has_group (profiles, res_group_name)); - - g_key_file_set_string (profiles, res_group_name, "Name", id); - g_key_file_set_integer (profiles, res_group_name, "IsRelative", 1); - g_key_file_set_string (profiles, res_group_name, "Path", res_dir_name); - - gchar *data = g_key_file_to_data (profiles, NULL, NULL); - g_file_replace_contents (profiles_file, data, strlen (data), NULL, TRUE, - G_FILE_CREATE_NONE, NULL, NULL, NULL); - g_free (data); - +#ifdef UNITY_WEBAPPS_ENABLE_DEBUG default_extensions_path = g_strdup_printf ("%s/extensions", default_dir_path); if (!g_file_test (default_extensions_path, G_FILE_TEST_IS_DIR)) { @@ -855,6 +854,7 @@ create_link (extensions, "/extensions"); create_link (extensions_ini, "/extensions.ini"); +#endif #undef create_link res = TRUE; @@ -863,48 +863,47 @@ g_free (res_dir_name); g_free (res_dir_path); g_free (default_dir_path); - g_free (default_profile_name); g_object_unref (default_dir); return res; } +static GFile* +_firefox_get_profiles_dir (void) +{ + gchar *tmp = g_strdup_printf ("%s/.mozilla/firefox/", g_get_home_dir ()); + GFile *res = g_file_new_for_path (tmp); + + g_free (tmp); + + return res; +} + static gchar* _firefox_get_profile_for_app (const gchar *name, const gchar *domain) { gchar *res = NULL; - gchar* tmp = g_strdup_printf ("%s/.mozilla/firefox/", g_get_home_dir ()); - - GFile *dir = g_file_new_for_path (tmp); - g_free (tmp); - GFile *profiles_file = g_file_get_child (dir, "profiles.ini"); - GKeyFile *profiles = g_key_file_new (); + GFile *dir = _firefox_get_profiles_dir (); - tmp = g_file_get_path (profiles_file); - if (g_key_file_load_from_file (profiles, tmp, G_KEY_FILE_NONE, NULL)) + gchar *id = _firefox_profile_get_name_for_app (name, domain); + GFile *location = _firefox_webapps_profile_get_location (dir, id); + if (location) + { + res = g_file_get_path (location); + g_object_unref (location); + } + else { - gchar *id = _firefox_profile_get_name_for_app (name, domain); - GFile *location = _firefox_profile_get_location (profiles, dir, id); - if (location) + if (_firefox_profile_create (id, dir)) { - res = g_strdup (id); - g_object_unref (location); + res = g_file_get_path (location); } - else - { - if (_firefox_profile_create (profiles, id, dir, profiles_file)) - { - res = g_strdup (id); - } - } - g_free (id); } + g_free (id); g_object_unref (dir); - g_object_unref (profiles_file); - g_key_file_unref (profiles); return res; } @@ -927,10 +926,12 @@ if (g_str_has_suffix (exe_name, "firefox")) { - gchar *profile_name = _firefox_get_profile_for_app (name, domain); + gchar *profile_path = _firefox_get_profile_for_app (name, domain); - if (profile_name) - return g_strdup_printf ("%s --chromeless -no-remote -P %s '%%s'", exe_name, profile_name); + if (profile_path) + { + return g_strdup_printf ("%s --chromeless -no-remote -profile %s '%%s'", exe_name, profile_path); + } } return g_strdup_printf ("%s --chromeless --new-window '%%s'", exe_name); diff -Nru libunity-webapps-2.3.3/tests/Makefile.in libunity-webapps-2.3.5/tests/Makefile.in --- libunity-webapps-2.3.3/tests/Makefile.in 2012-09-19 13:29:34.007833279 +0000 +++ libunity-webapps-2.3.5/tests/Makefile.in 2012-09-20 05:04:42.703494724 +0000 @@ -145,6 +145,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/tests/context-daemon/Makefile.in libunity-webapps-2.3.5/tests/context-daemon/Makefile.in --- libunity-webapps-2.3.3/tests/context-daemon/Makefile.in 2012-09-19 13:29:34.135833283 +0000 +++ libunity-webapps-2.3.5/tests/context-daemon/Makefile.in 2012-09-20 05:04:42.811494727 +0000 @@ -205,6 +205,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/tests/repository/Makefile.in libunity-webapps-2.3.5/tests/repository/Makefile.in --- libunity-webapps-2.3.3/tests/repository/Makefile.in 2012-09-19 13:29:34.207833286 +0000 +++ libunity-webapps-2.3.5/tests/repository/Makefile.in 2012-09-20 05:04:42.851494728 +0000 @@ -144,6 +144,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/tests/repository/application-manifest/Makefile.in libunity-webapps-2.3.5/tests/repository/application-manifest/Makefile.in --- libunity-webapps-2.3.3/tests/repository/application-manifest/Makefile.in 2012-09-19 13:29:34.295833289 +0000 +++ libunity-webapps-2.3.5/tests/repository/application-manifest/Makefile.in 2012-09-20 05:04:42.899494729 +0000 @@ -145,6 +145,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/tests/repository/application-repository/Makefile.in libunity-webapps-2.3.5/tests/repository/application-repository/Makefile.in --- libunity-webapps-2.3.3/tests/repository/application-repository/Makefile.in 2012-09-19 13:29:34.383833291 +0000 +++ libunity-webapps-2.3.5/tests/repository/application-repository/Makefile.in 2012-09-20 05:04:42.959494731 +0000 @@ -145,6 +145,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/tests/repository/available-application/Makefile.in libunity-webapps-2.3.5/tests/repository/available-application/Makefile.in --- libunity-webapps-2.3.3/tests/repository/available-application/Makefile.in 2012-09-19 13:29:34.463833294 +0000 +++ libunity-webapps-2.3.5/tests/repository/available-application/Makefile.in 2012-09-20 05:04:43.011494732 +0000 @@ -145,6 +145,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/tests/repository/local-index/Makefile.in libunity-webapps-2.3.5/tests/repository/local-index/Makefile.in --- libunity-webapps-2.3.3/tests/repository/local-index/Makefile.in 2012-09-19 13:29:34.559833297 +0000 +++ libunity-webapps-2.3.5/tests/repository/local-index/Makefile.in 2012-09-20 05:04:43.063494734 +0000 @@ -153,6 +153,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/tests/traced/Makefile.in libunity-webapps-2.3.5/tests/traced/Makefile.in --- libunity-webapps-2.3.3/tests/traced/Makefile.in 2012-09-19 13:29:34.619833299 +0000 +++ libunity-webapps-2.3.5/tests/traced/Makefile.in 2012-09-20 05:04:43.103494735 +0000 @@ -146,6 +146,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/tests/traced/actions/Makefile.in libunity-webapps-2.3.5/tests/traced/actions/Makefile.in --- libunity-webapps-2.3.3/tests/traced/actions/Makefile.in 2012-09-19 13:29:34.691833302 +0000 +++ libunity-webapps-2.3.5/tests/traced/actions/Makefile.in 2012-09-20 05:04:43.159494736 +0000 @@ -155,6 +155,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/tests/traced/common/Makefile.in libunity-webapps-2.3.5/tests/traced/common/Makefile.in --- libunity-webapps-2.3.3/tests/traced/common/Makefile.in 2012-09-19 13:29:34.731833303 +0000 +++ libunity-webapps-2.3.5/tests/traced/common/Makefile.in 2012-09-20 05:04:43.195494737 +0000 @@ -104,6 +104,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/tests/traced/fuzz/Makefile.in libunity-webapps-2.3.5/tests/traced/fuzz/Makefile.in --- libunity-webapps-2.3.3/tests/traced/fuzz/Makefile.in 2012-09-19 13:29:34.787833305 +0000 +++ libunity-webapps-2.3.5/tests/traced/fuzz/Makefile.in 2012-09-20 05:04:43.243494739 +0000 @@ -138,6 +138,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/tests/traced/indicator/Makefile.in libunity-webapps-2.3.5/tests/traced/indicator/Makefile.in --- libunity-webapps-2.3.3/tests/traced/indicator/Makefile.in 2012-09-19 13:29:34.875833308 +0000 +++ libunity-webapps-2.3.5/tests/traced/indicator/Makefile.in 2012-09-20 05:04:43.315494740 +0000 @@ -239,6 +239,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/tests/traced/launcher/Makefile.in libunity-webapps-2.3.5/tests/traced/launcher/Makefile.in --- libunity-webapps-2.3.3/tests/traced/launcher/Makefile.in 2012-09-19 13:29:34.951833310 +0000 +++ libunity-webapps-2.3.5/tests/traced/launcher/Makefile.in 2012-09-20 05:04:43.383494742 +0000 @@ -200,6 +200,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/tests/traced/misc/Makefile.in libunity-webapps-2.3.5/tests/traced/misc/Makefile.in --- libunity-webapps-2.3.3/tests/traced/misc/Makefile.in 2012-09-19 13:29:35.023833312 +0000 +++ libunity-webapps-2.3.5/tests/traced/misc/Makefile.in 2012-09-20 05:04:43.447494744 +0000 @@ -197,6 +197,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/tests/traced/multicontext/Makefile.in libunity-webapps-2.3.5/tests/traced/multicontext/Makefile.in --- libunity-webapps-2.3.3/tests/traced/multicontext/Makefile.in 2012-09-19 13:29:35.075833314 +0000 +++ libunity-webapps-2.3.5/tests/traced/multicontext/Makefile.in 2012-09-20 05:04:43.495494745 +0000 @@ -138,6 +138,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/tests/traced/music-player/Makefile.in libunity-webapps-2.3.5/tests/traced/music-player/Makefile.in --- libunity-webapps-2.3.3/tests/traced/music-player/Makefile.in 2012-09-19 13:29:35.163833317 +0000 +++ libunity-webapps-2.3.5/tests/traced/music-player/Makefile.in 2012-09-20 05:04:43.563494747 +0000 @@ -169,6 +169,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/tests/traced/notification/Makefile.in libunity-webapps-2.3.5/tests/traced/notification/Makefile.in --- libunity-webapps-2.3.3/tests/traced/notification/Makefile.in 2012-09-19 13:29:35.251833320 +0000 +++ libunity-webapps-2.3.5/tests/traced/notification/Makefile.in 2012-09-20 05:04:43.623494749 +0000 @@ -166,6 +166,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/tests/traced/observer-api/Makefile.in libunity-webapps-2.3.5/tests/traced/observer-api/Makefile.in --- libunity-webapps-2.3.3/tests/traced/observer-api/Makefile.in 2012-09-19 13:29:35.355833323 +0000 +++ libunity-webapps-2.3.5/tests/traced/observer-api/Makefile.in 2012-09-20 05:04:43.671494750 +0000 @@ -138,6 +138,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/tests/traced/test-runner/Makefile.in libunity-webapps-2.3.5/tests/traced/test-runner/Makefile.in --- libunity-webapps-2.3.3/tests/traced/test-runner/Makefile.in 2012-09-19 13:29:35.435833326 +0000 +++ libunity-webapps-2.3.5/tests/traced/test-runner/Makefile.in 2012-09-20 05:04:43.723494752 +0000 @@ -175,6 +175,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/tests/traced/test-runner/post-actions/Makefile.in libunity-webapps-2.3.5/tests/traced/test-runner/post-actions/Makefile.in --- libunity-webapps-2.3.3/tests/traced/test-runner/post-actions/Makefile.in 2012-09-19 13:29:35.495833328 +0000 +++ libunity-webapps-2.3.5/tests/traced/test-runner/post-actions/Makefile.in 2012-09-20 05:04:43.787494753 +0000 @@ -160,6 +160,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ diff -Nru libunity-webapps-2.3.3/tools/Makefile.in libunity-webapps-2.3.5/tools/Makefile.in --- libunity-webapps-2.3.3/tools/Makefile.in 2012-09-19 13:29:35.591833331 +0000 +++ libunity-webapps-2.3.5/tools/Makefile.in 2012-09-20 05:04:43.871494756 +0000 @@ -200,6 +200,8 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GDBUS_CODEGEN = @GDBUS_CODEGEN@ +GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ +GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@