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

Proposed by Akshay Shekher on 2014-05-28
Status: Merged
Approved by: David Gomes on 2014-05-28
Approved revision: 420
Merged at revision: 420
Proposed branch: lp:~voldyman/slingshot/fix-1199903
Merge into: lp:~elementary-pantheon/slingshot/trunk
Diff against target: 41 lines (+2/-11)
2 files modified
CMakeLists.txt (+2/-2)
src/SlingshotView.vala (+0/-9)
To merge this branch: bzr merge lp:~voldyman/slingshot/fix-1199903
Reviewer Review Type Date Requested Status
David Gomes 2014-05-28 Approve on 2014-05-28
Review via email: mp+221211@code.launchpad.net

Commit message

Removed Gdx.X11 and Wnck dependency

Description of the change

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

To post a comment you must log in.
David Gomes (davidgomes) wrote :

Tested and it works just fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-02-24 15:30:13 +0000
3+++ CMakeLists.txt 2014-05-28 11:51:54 +0000
4@@ -54,7 +54,7 @@
5 message ("-- Zeitgeist integration disabled")
6 endif ()
7
8-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};")
9+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};")
10 set (UI_DEPS "gtk+-3.0>=3.10.0;granite;${ZEITGEIST_DEPS};")
11
12 find_package (PkgConfig)
13@@ -96,7 +96,7 @@
14 # Comment this out to enable C compiler warnings
15 add_definitions (-w)
16
17-add_definitions (${DEPS_CFLAGS} -DGMENU_I_KNOW_THIS_IS_UNSTABLE -DWNCK_I_KNOW_THIS_IS_UNSTABLE -include config.h)
18+add_definitions (${DEPS_CFLAGS} -DGMENU_I_KNOW_THIS_IS_UNSTABLE -include config.h)
19 link_libraries (${DEPS_LIBRARIES})
20 link_directories (${DEPS_LIBRARY_DIRS})
21
22
23=== modified file 'src/SlingshotView.vala'
24--- src/SlingshotView.vala 2014-05-24 23:01:41 +0000
25+++ src/SlingshotView.vala 2014-05-28 11:51:54 +0000
26@@ -650,15 +650,6 @@
27 set_focus(null);
28 search_entry.grab_focus ();
29 set_modality ((Modality) view_selector.selected);
30-
31- while (Gtk.events_pending ())
32- Gtk.main_iteration ();
33-
34- var xid = Gdk.X11Window.get_xid (this.get_window ());
35- var w = Wnck.Window.get (xid);
36- Wnck.Screen.get_default ().force_update ();
37- if (w != null)
38- w.activate (Gdk.x11_get_server_time (this.get_window ()));
39 }
40
41 private void set_modality (Modality new_modality) {

Subscribers

People subscribed via source and target branches