summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-04-19 07:34:08 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-04-19 07:34:08 +0200
commitd8de168a87a0f8ba390490934cac0d7a6d31477d (patch)
treef4229f95b7877a10861a4b044e5ecae6936083ed
parentb1025dfed309977acba6cd844a558f68d9e46bbe (diff)
parent5478fe2ceb86715f4ab9a51eb97c517465febfa6 (diff)
Merge tag 'upstream/0.6.1'
Upstream version 0.6.1
-rw-r--r--src/deamon.vala2
-rw-r--r--src/pies/pieManager.vala9
-rwxr-xr-xsrc/renderers/pieWindow.vala13
3 files changed, 13 insertions, 11 deletions
diff --git a/src/deamon.vala b/src/deamon.vala
index daa6d9d..ff7e764 100644
--- a/src/deamon.vala
+++ b/src/deamon.vala
@@ -36,7 +36,7 @@ public class Deamon : GLib.Object {
/////////////////////////////////////////////////////////////////////
public static int main(string[] args) {
- version = "0.6.0";
+ version = "0.6.1";
Logger.init();
Gtk.init(ref args);
diff --git a/src/pies/pieManager.vala b/src/pies/pieManager.vala
index 55cb353..305b444 100644
--- a/src/pies/pieManager.vala
+++ b/src/pies/pieManager.vala
@@ -95,10 +95,6 @@ public class PieManager : GLib.Object {
var window = new PieWindow();
window.load_pie(pie);
- window.open();
-
- opened_windows.add(window);
-
window.on_closed.connect(() => {
opened_windows.remove(window);
if (opened_windows.size == 0) {
@@ -111,9 +107,12 @@ public class PieManager : GLib.Object {
a_pie_is_active = false;
});
+ opened_windows.add(window);
+
+ window.open();
//restore default WM_CLASS after window open
- Gdk.set_program_class("gnome-pie");
+ Gdk.set_program_class("Gnome-pie");
} else {
warning("Failed to open pie with ID \"" + id + "\": ID does not exist!");
diff --git a/src/renderers/pieWindow.vala b/src/renderers/pieWindow.vala
index 4d5d35a..c8ff455 100755
--- a/src/renderers/pieWindow.vala
+++ b/src/renderers/pieWindow.vala
@@ -118,12 +118,15 @@ public class PieWindow : Gtk.Window {
this.has_compositing = true;
}
+ //add_events() call was removed because it causes that gnome-pie sometimes enter
+ //and infinte loop while processing some mouse-motion events.
+ //(this was seen in Ubuntu 14.04.2 64/32-bits -Glib 2.19- and in MATE 14.04.2)
// set up event filter
- this.add_events(Gdk.EventMask.BUTTON_RELEASE_MASK |
- Gdk.EventMask.KEY_RELEASE_MASK |
- Gdk.EventMask.KEY_PRESS_MASK |
- Gdk.EventMask.POINTER_MOTION_MASK |
- Gdk.EventMask.SCROLL_MASK );
+ //this.add_events(Gdk.EventMask.BUTTON_RELEASE_MASK |
+ // Gdk.EventMask.KEY_RELEASE_MASK |
+ // Gdk.EventMask.KEY_PRESS_MASK |
+ // Gdk.EventMask.POINTER_MOTION_MASK |
+ // Gdk.EventMask.SCROLL_MASK );
// activate on left click
this.button_release_event.connect ((e) => {