Merge lp:~azzar1/bamf/lp-1407192 into lp:bamf

[Andrea Azzarone]

Replace gtk_icon_theme_has_icon with gtk_icon_theme_lookup_icon.

[lp:~azzar1/bamf/lp-1407192]

605. By Andrea Azzarone on 2015-01-16

Replace gtk_icon_theme_has_icon with gtk_icon_theme_lookup_icon.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:605
http://jenkins.qa.ubuntu.com/job/bamf-ci/106/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-vivid-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-vivid-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/bamf-ci/106/rebuild

review: Needs Fixing (continuous-integration)

[lp:~azzar1/bamf/lp-1407192]

606. By Andrea Azzarone on 2015-01-21

Minor change.

[Andrea Azzarone (azzar1)]

Done!

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

=== modified file 'src/bamf-application.c'
--- src/bamf-application.c	2014-02-14 06:45:13 +0000
+++ src/bamf-application.c	2015-01-21 14:43:36 +0000
@@ -182,6 +182,7 @@
 icon_name_is_valid (const char *name)
 {
   GtkIconTheme *icon_theme;
+  GtkIconInfo *icon_info;
 
   if (!name || name[0] == '\0')
     return FALSE;
@@ -189,8 +190,17 @@
   if (g_file_test (name, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))
     return TRUE;
 
+  // Please note that since gtk 3.14 gtk_icon_theme_has_icon stopped working.
   icon_theme = gtk_icon_theme_get_default ();
-  return gtk_icon_theme_has_icon (icon_theme, name);
+  icon_info = gtk_icon_theme_lookup_icon (icon_theme, name, -1, 0);
+
+  if (icon_info != NULL)
+    {
+      g_object_unref (icon_info);
+      return TRUE;
+    }
+
+  return FALSE;
 }
 
 static gboolean