Merge lp:~larsu/indicator-printers/remove-gstrv-contains into lp:indicator-printers/15.04

[Lars Karlitski]

Remove g_strv_contains()

It was added to glib recently.

Remove g_strv_contains()

It was added to glib recently.

[Sebastien Bacher (seb128)]

shouldn't the glib requirement be bumped to that glib version?

[lp:~larsu/indicator-printers/remove-gstrv-contains]

74. By Lars Karlitski on 2015-02-06

Bump glib depend for g_strv_contains()

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:74
http://jenkins.qa.ubuntu.com/job/indicator-printers-ci/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-printers-vivid-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-printers-vivid-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-printers-ci/4/rebuild

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

we only have glib 2.43, should probably use that for the b-d

review: Needs Fixing

[lp:~larsu/indicator-printers/remove-gstrv-contains]

75. By Lars Karlitski on 2015-02-06

Bump glib version, this time to the correct one

2.44 is not yet released.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:75
http://jenkins.qa.ubuntu.com/job/indicator-printers-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-printers-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-printers-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/indicator-printers-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-printers-ci/5/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== modified file 'debian/control'
--- debian/control	2012-11-20 15:26:51 +0000
+++ debian/control	2015-02-06 16:34:35 +0000
@@ -8,7 +8,7 @@
                dh-autoreconf,
                gnome-common,
                python,
-               libglib2.0-dev (>= 2.22.3),
+               libglib2.0-dev (>= 2.43.2),
                libgtk-3-dev,
                libdbusmenu-glib-dev (>= 0.5.90),
                libdbusmenu-gtk3-dev (>= 0.5.90),

=== modified file 'src/indicator-printer-state-notifier.c'
--- src/indicator-printer-state-notifier.c	2012-03-03 10:43:18 +0000
+++ src/indicator-printer-state-notifier.c	2015-02-06 16:34:35 +0000
@@ -72,24 +72,6 @@
 }
 
 
-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 @@
         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);
     }