Merge lp:~midori/midori/fix-1094858 into lp:midori

[Danielle Foré]

No idea what this does, just migrating a patch to a bzr branch. From the original report:

"midori/midori-locationaction.c: Remove unused pointer `background`

    The pointer `background` is not used in `midori_location_entry_render_text_cb()`."

[lp:~midori/midori/fix-1094858]

6163. By Paul Menzel on 2013-05-20

remove unused pointer background

[Cris Dywan (kalikiana)]

Makes sense, in fact there's 2 more instances of this pattern: declaring 'background' when it's actually already handled by the bound attributes. I'm taking care of those bits.

review: Approve

=== modified file 'midori/midori-locationaction.c'
--- midori/midori-locationaction.c	2013-04-18 23:16:56 +0000
+++ midori/midori-locationaction.c	2013-05-20 08:54:25 +0000
@@ -352,12 +352,10 @@
 {
     MidoriLocationAction* action = data;
     gchar* title;
-    gchar* background;
     gchar* desc;
 
     gtk_tree_model_get (model, iter,
         MIDORI_AUTOCOMPLETER_COLUMNS_MARKUP, &title,
-        MIDORI_AUTOCOMPLETER_COLUMNS_BACKGROUND, &background,
         -1);
 
     if (strchr (title, '\n')) /* A search engine or action suggestion */
@@ -365,7 +363,6 @@
         gchar** parts = g_strsplit (title, "\n", 2);
         desc = g_strdup (parts[0]);
         g_strfreev (parts);
-        g_free (background);
     }
     else
     {
@@ -406,7 +403,6 @@
         gchar** parts = g_strsplit (title, "\n", 2);
         desc = g_strdup (parts[1]);
         g_strfreev (parts);
-        g_free (background);
     }
     else
     {