* New upstream release.

  * Adding label support into the library
  * Adding label support into the indicator
  * Allow the icon theme path to be changed dynamically (LP: #607831)
* Rebuild with the new gobject introspection

2 files changed, 102 insertions, 23 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index b0ceb16..1078794 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -80,11 +80,8 @@ libexec_PROGRAMS = indicator-application-service$(EXEEXT)
 @HAVE_INTROSPECTION_TRUE@	$(vapi_DATA)
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/src/application-service-marshal.c b/src/application-service-marshal.c
index 2b7dc77..db095ce 100644
--- a/src/application-service-marshal.c
+++ b/src/application-service-marshal.c
@@ -22,6 +22,7 @@
 #define g_marshal_value_peek_boxed(v)    g_value_get_boxed (v)
 #define g_marshal_value_peek_pointer(v)  g_value_get_pointer (v)
 #define g_marshal_value_peek_object(v)   g_value_get_object (v)
+#define g_marshal_value_peek_variant(v)  g_value_get_variant (v)
 #else /* !G_ENABLE_DEBUG */
 /* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
  *          Do not access GValues directly in your code. Instead, use the
@@ -45,30 +46,33 @@
 #define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
 #define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
 #define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
+#define g_marshal_value_peek_variant(v)  (v)->data[0].v_pointer
 #endif /* !G_ENABLE_DEBUG */
 
 
-/* VOID:STRING,INT,STRING,STRING,STRING (./application-service-marshal.list:19) */
+/* VOID:STRING,INT,STRING,STRING,STRING,STRING,STRING (./application-service-marshal.list:19) */
 void
-_application_service_marshal_VOID__STRING_INT_STRING_STRING_STRING (GClosure     *closure,
-                                                                    GValue       *return_value G_GNUC_UNUSED,
-                                                                    guint         n_param_values,
-                                                                    const GValue *param_values,
-                                                                    gpointer      invocation_hint G_GNUC_UNUSED,
-                                                                    gpointer      marshal_data)
+_application_service_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING (GClosure     *closure,
+                                                                                  GValue       *return_value G_GNUC_UNUSED,
+                                                                                  guint         n_param_values,
+                                                                                  const GValue *param_values,
+                                                                                  gpointer      invocation_hint G_GNUC_UNUSED,
+                                                                                  gpointer      marshal_data)
 {
-  typedef void (*GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING) (gpointer     data1,
-                                                                      gpointer     arg_1,
-                                                                      gint         arg_2,
-                                                                      gpointer     arg_3,
-                                                                      gpointer     arg_4,
-                                                                      gpointer     arg_5,
-                                                                      gpointer     data2);
-  register GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING callback;
+  typedef void (*GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING) (gpointer     data1,
+                                                                                    gpointer     arg_1,
+                                                                                    gint         arg_2,
+                                                                                    gpointer     arg_3,
+                                                                                    gpointer     arg_4,
+                                                                                    gpointer     arg_5,
+                                                                                    gpointer     arg_6,
+                                                                                    gpointer     arg_7,
+                                                                                    gpointer     data2);
+  register GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING callback;
   register GCClosure *cc = (GCClosure*) closure;
   register gpointer data1, data2;
 
-  g_return_if_fail (n_param_values == 6);
+  g_return_if_fail (n_param_values == 8);
 
   if (G_CCLOSURE_SWAP_DATA (closure))
     {
@@ -80,7 +84,7 @@ _application_service_marshal_VOID__STRING_INT_STRING_STRING_STRING (GClosure
       data1 = g_value_peek_pointer (param_values + 0);
       data2 = closure->data;
     }
-  callback = (GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING) (marshal_data ? marshal_data : cc->callback);
+  callback = (GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING) (marshal_data ? marshal_data : cc->callback);
 
   callback (data1,
             g_marshal_value_peek_string (param_values + 1),
@@ -88,10 +92,51 @@ _application_service_marshal_VOID__STRING_INT_STRING_STRING_STRING (GClosure
             g_marshal_value_peek_string (param_values + 3),
             g_marshal_value_peek_string (param_values + 4),
             g_marshal_value_peek_string (param_values + 5),
+            g_marshal_value_peek_string (param_values + 6),
+            g_marshal_value_peek_string (param_values + 7),
             data2);
 }
 
-/* VOID:INT,STRING (./application-service-marshal.list:20) */
+/* VOID:INT,STRING,STRING (./application-service-marshal.list:20) */
+void
+_application_service_marshal_VOID__INT_STRING_STRING (GClosure     *closure,
+                                                      GValue       *return_value G_GNUC_UNUSED,
+                                                      guint         n_param_values,
+                                                      const GValue *param_values,
+                                                      gpointer      invocation_hint G_GNUC_UNUSED,
+                                                      gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__INT_STRING_STRING) (gpointer     data1,
+                                                        gint         arg_1,
+                                                        gpointer     arg_2,
+                                                        gpointer     arg_3,
+                                                        gpointer     data2);
+  register GMarshalFunc_VOID__INT_STRING_STRING callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 4);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__INT_STRING_STRING) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_int (param_values + 1),
+            g_marshal_value_peek_string (param_values + 2),
+            g_marshal_value_peek_string (param_values + 3),
+            data2);
+}
+
+/* VOID:INT,STRING (./application-service-marshal.list:21) */
 void
 _application_service_marshal_VOID__INT_STRING (GClosure     *closure,
                                                GValue       *return_value G_GNUC_UNUSED,
@@ -128,3 +173,40 @@ _application_service_marshal_VOID__INT_STRING (GClosure     *closure,
             data2);
 }
 
+/* VOID:STRING,STRING (./application-service-marshal.list:22) */
+void
+_application_service_marshal_VOID__STRING_STRING (GClosure     *closure,
+                                                  GValue       *return_value G_GNUC_UNUSED,
+                                                  guint         n_param_values,
+                                                  const GValue *param_values,
+                                                  gpointer      invocation_hint G_GNUC_UNUSED,
+                                                  gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer     data1,
+                                                    gpointer     arg_1,
+                                                    gpointer     arg_2,
+                                                    gpointer     data2);
+  register GMarshalFunc_VOID__STRING_STRING callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__STRING_STRING) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_string (param_values + 1),
+            g_marshal_value_peek_string (param_values + 2),
+            data2);
+}
+