Merge lp:~voldyman/slingshot/fix-1199903 into lp:~elementary-pantheon/slingshot/trunk

[Akshay Shekher]

Removed Gdx.X11 and Wnck dependency

Removed the code that uses Gdk.X!! for focus issues, those issues don't occur anymore.

[David Gomes (davidgomes)]

Tested and it works just fine.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-24 15:30:13 +0000
+++ CMakeLists.txt	2014-05-28 11:51:54 +0000
@@ -54,7 +54,7 @@
   message ("-- Zeitgeist integration disabled")
 endif ()
 
-set (CORE_DEPS "gobject-2.0;glib-2.0;gio-2.0;gio-unix-2.0;gee-0.8;libgnome-menu-3.0;libwnck-3.0;gdk-x11-3.0;${UNITY_DEPS};")
+set (CORE_DEPS "gobject-2.0;glib-2.0;gio-2.0;gio-unix-2.0;gee-0.8;libgnome-menu-3.0;${UNITY_DEPS};")
 set (UI_DEPS "gtk+-3.0>=3.10.0;granite;${ZEITGEIST_DEPS};")
 
 find_package (PkgConfig)
@@ -96,7 +96,7 @@
 # Comment this out to enable C compiler warnings
 add_definitions (-w)
 
-add_definitions (${DEPS_CFLAGS} -DGMENU_I_KNOW_THIS_IS_UNSTABLE -DWNCK_I_KNOW_THIS_IS_UNSTABLE -include config.h)
+add_definitions (${DEPS_CFLAGS} -DGMENU_I_KNOW_THIS_IS_UNSTABLE -include config.h)
 link_libraries (${DEPS_LIBRARIES})
 link_directories (${DEPS_LIBRARY_DIRS})
 
 
=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2014-05-24 23:01:41 +0000
+++ src/SlingshotView.vala	2014-05-28 11:51:54 +0000
@@ -650,15 +650,6 @@
             set_focus(null);
             search_entry.grab_focus ();
             set_modality ((Modality) view_selector.selected);
-
-            while (Gtk.events_pending ())
-                Gtk.main_iteration ();
-
-            var xid = Gdk.X11Window.get_xid (this.get_window ());
-            var w = Wnck.Window.get (xid);
-            Wnck.Screen.get_default ().force_update ();
-            if (w != null)
-                w.activate (Gdk.x11_get_server_time (this.get_window ()));
         }
 
         private void set_modality (Modality new_modality) {