Merge lp:~muktupavels/gnome-menus/fix-typo-in-support-multile-desktops-patch into lp:ubuntu/vivid/gnome-menus

[Alberts Muktupāvels]

Fix small bug in support_multiple_desktops patch.

Fix small bug in support_multiple_desktops patch.

[Brian Murray (brian-murray)]

This seems to have been fixed upstream.

https://git.gnome.org/browse/gnome-menus/commit/?id=4befe76fbdb76aa6a986297ef71d1601b2ced42e

review: Approve

[Brian Murray (brian-murray)]

I've uploaded this to vivid, thanks!

review: Approve

=== modified file 'debian/patches/support_multiple_desktops.patch'
--- debian/patches/support_multiple_desktops.patch	2014-11-17 18:42:20 +0000
+++ debian/patches/support_multiple_desktops.patch	2015-01-09 22:31:03 +0000
@@ -35,7 +35,7 @@
 -      else
 -        current_desktop = g_strdup (desktop);
 -    }
-+      if (desktops)
++      if (!desktops)
 +        desktops = "";
  
 -  /* Using "*" means skipping desktop-related checks */

=== modified file 'libmenu/desktop-entries.c'
--- libmenu/desktop-entries.c	2014-11-17 18:42:20 +0000
+++ libmenu/desktop-entries.c	2015-01-09 22:31:03 +0000
@@ -99,7 +99,7 @@
 
       desktops = g_getenv ("XDG_CURRENT_DESKTOP");
 
-      if (desktops)
+      if (!desktops)
         desktops = "";
 
       tmp = g_strsplit (desktops, ":", 0);