Merge lp:~voluntatefaber/slingshot/bug856528 into lp:~elementary-pantheon/slingshot/trunk

[Andrea Basso]

[Cody Garver (codygarver)]

Hi Andrea! Please merge your branches with the latest changes to lp:slingshot before I review them.

[lp:~voluntatefaber/slingshot/bug856528]

168. By Andrea Basso on 2012-04-25

Merged main branch

[Andrea Basso (voluntatefaber)]

> Hi Andrea! Please merge your branches with the latest changes to lp:slingshot
> before I review them.

Done :D

[Cody Garver (codygarver)]

review: Approve

=== modified file 'src/Backend/App.vala'
--- src/Backend/App.vala	2012-02-25 13:14:25 +0000
+++ src/Backend/App.vala	2012-04-25 12:04:20 +0000
@@ -69,14 +69,17 @@
                 icon = Slingshot.icon_theme.load_icon (icon_name, Slingshot.settings.icon_size,
                                                         Gtk.IconLookupFlags.FORCE_SIZE);
             } catch (Error e) {
-	    	try {
-                    icon = Slingshot.icon_theme.load_icon ("application-default-icon", Slingshot.settings.icon_size,
-                                                           Gtk.IconLookupFlags.FORCE_SIZE);
-		}
-		catch (Error e) {
-                    icon = Slingshot.icon_theme.load_icon ("gtk-missing-image", Slingshot.settings.icon_size,
-                                                           Gtk.IconLookupFlags.FORCE_SIZE);
-		}
+                try {
+                    icon = new Gdk.Pixbuf.from_file_at_scale (icon_name, Slingshot.settings.icon_size, Slingshot.settings.icon_size, false);
+                } catch (Error e) {
+	            	try {
+                        icon = Slingshot.icon_theme.load_icon ("application-default-icon", Slingshot.settings.icon_size,
+                                                               Gtk.IconLookupFlags.FORCE_SIZE);
+	        	    } catch (Error e) {
+                        icon = Slingshot.icon_theme.load_icon ("gtk-missing-image", Slingshot.settings.icon_size,
+                                                               Gtk.IconLookupFlags.FORCE_SIZE);
+	            	}
+                }
             }
 
             icon_changed ();

=== modified file 'src/Widgets/SearchItem.vala'
--- src/Widgets/SearchItem.vala	2012-04-25 02:13:12 +0000
+++ src/Widgets/SearchItem.vala	2012-04-25 12:04:20 +0000
@@ -35,11 +35,10 @@
             get_style_context ().add_class ("app");            
 
             icon = app.icon;
-
-            var label = @"<b><span size=\"larger\">$(app.name)</span></b>\n" +
-                        @"$(Utils.truncate_text (app.description, 200))";
-
-            app_label = new Label (label.replace ("&", "&amp;"));
+            var label = "<b><span size=\"larger\">" + fix (app.name) + "</span></b>\n" +
+                        fix (Utils.truncate_text (app.description, 200));
+
+            app_label = new Label (label);
             app_label.use_markup = true;
             app_label.xalign = 0.0f;
 
@@ -69,7 +68,10 @@
             return true;
 
         }
-
+        
+        private string fix (string text) {
+            return text.replace ("&", "&amp;").replace ("<", "&lt;").replace (">", "&gt;");
+        }
     }
 
 }