aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Uebernickel <lars.uebernickel@canonical.com>2015-02-06 15:32:11 +0100
committerLars Uebernickel <lars.uebernickel@canonical.com>2015-02-06 15:32:11 +0100
commit9cf24af1d3f70ab11ca019beafa52138cf2eea74 (patch)
treea450509a6243ebabd43efa1156c1c1a8ae96637e
parent733c011f94aff2af2f3eba2ddd912d8de89a1036 (diff)
downloadayatana-indicator-printers-9cf24af1d3f70ab11ca019beafa52138cf2eea74.tar.gz
ayatana-indicator-printers-9cf24af1d3f70ab11ca019beafa52138cf2eea74.tar.bz2
ayatana-indicator-printers-9cf24af1d3f70ab11ca019beafa52138cf2eea74.zip
Remove g_strv_contains()
It was added to glib recently.
-rw-r--r--src/indicator-printer-state-notifier.c20
1 files changed, 1 insertions, 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);
}