Commit a4c4c5d5 authored by Chris Cummins's avatar Chris Cummins Committed by Lucas Beeler

Removes all hard dependencies on X11 libraries, making Shotwell display-server...

Removes all hard dependencies on X11 libraries, making Shotwell display-server agnostic and able to run under Weston/Weyland. Closes #6606.
parent 0bf992ab
......@@ -288,7 +288,6 @@ LOCAL_PKGS = \
EXT_PKGS = \
atk \
gdk-3.0 \
gdk-x11-3.0 \
gee-1.0 \
gexiv2 \
gio-unix-2.0 \
......
......@@ -18,6 +18,7 @@ Jonas Bushart <eberhardtjonas@aol.com>
Alban Browaeys <prahal@yahoo.com>
Joseph Bylund <joseph.bylund@gmail.com>
Matthias Clasen <matthias.clasen@gmail.com>
Chris Cummins <christopher.e.cummins@intel.com>
Valentin David <valentin.david@gmail.com>
Sergey Davidoff <shnatsel@gmail.com>
Tobe Deprez <tobedeprez@gmx.com>
......
......@@ -2197,12 +2197,8 @@ public abstract class EditingHostPage : SinglePhotoPage {
tool_window.move(x, y);
}
// we need both show & present so we get keyboard focus in metacity, but due to a bug in
// compiz, we only want to show the window.
// ticket #2141 prompted this: http://trac.yorba.org/ticket/2141
tool_window.show();
if (!get_window_manager().down().contains("compiz"))
tool_window.present();
tool_window.present();
}
protected override void on_next_photo() {
......
atk
gdk-3.0
gdk-x11-3.0
gee-1.0
gexiv2
gio-unix-2.0
......
......@@ -86,10 +86,6 @@ public bool has_only_key_modifier(Gdk.ModifierType field, Gdk.ModifierType mask)
| Gdk.ModifierType.META_MASK)) == mask;
}
public string get_window_manager() {
return Gdk.X11Screen.get_window_manager_name(AppWindow.get_instance().get_screen());
}
public string build_dummy_ui_string(Gtk.ActionGroup[] groups) {
string ui_string = "<ui>";
foreach (Gtk.ActionGroup group in groups) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment