From 9cf24af1d3f70ab11ca019beafa52138cf2eea74 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Fri, 6 Feb 2015 15:32:11 +0100
Subject: Remove g_strv_contains()

It was added to glib recently.
---
 src/indicator-printer-state-notifier.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/indicator-printer-state-notifier.c b/src/indicator-printer-state-notifier.c
index 65eb5b0..08a7ecb 100644
--- a/src/indicator-printer-state-notifier.c
+++ b/src/indicator-printer-state-notifier.c
@@ -72,24 +72,6 @@ g_hash_table_insert_many (GHashTable *hash_table,
 }
 
 
-static gboolean
-g_strv_contains (gchar **str_array,
-                 gchar *needle)
-{
-    gchar **str;
-
-    if (!str_array)
-        return FALSE;
-
-    for (str = str_array; *str; str++) {
-        if (!strcmp (*str, needle))
-            return TRUE;
-    }
-
-    return FALSE;
-}
-
-
 /* returns a list of strings that are in a but not in b; does not copy the
  * strings */
 static GList *
@@ -103,7 +85,7 @@ g_strv_diff (gchar **a,
         return NULL;
 
     for (p = a; *p; p++) {
-        if (!g_strv_contains (b, *p))
+        if (!g_strv_contains ((const gchar * const *) b, *p))
             result = g_list_prepend (result, *p);
     }
 
-- 
cgit v1.2.3


From 68e4adf9104bfc503ca0aa0c5cc1a8fc796d7872 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Fri, 6 Feb 2015 15:40:37 +0100
Subject: Bump glib depend for g_strv_contains()

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 6ae01eb..45545f0 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                gnome-common,
                python,
-               libglib2.0-dev (>= 2.22.3),
+               libglib2.0-dev (>= 2.44),
                libgtk-3-dev,
                libdbusmenu-glib-dev (>= 0.5.90),
                libdbusmenu-gtk3-dev (>= 0.5.90),
-- 
cgit v1.2.3


From 7df7cfffdd3249f96280e4b2f06bc4e4a5ef7d7f Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Fri, 6 Feb 2015 17:33:33 +0100
Subject: Bump glib version, this time to the correct one

2.44 is not yet released.
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 45545f0..62a0855 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                gnome-common,
                python,
-               libglib2.0-dev (>= 2.44),
+               libglib2.0-dev (>= 2.43.2),
                libgtk-3-dev,
                libdbusmenu-glib-dev (>= 0.5.90),
                libdbusmenu-gtk3-dev (>= 0.5.90),
-- 
cgit v1.2.3