Merge commit 'upstream/0.4.0'

1 files changed, 7 insertions, 7 deletions

diff --git a/src/gui/indicator.vala b/src/gui/indicator.vala
index 8033cb7..dea4d3c 100644
--- a/src/gui/indicator.vala
+++ b/src/gui/indicator.vala
@@ -38,7 +38,7 @@ public class Indicator : GLib.Object {
     /// The Preferences Menu of Gnome-Pie.
     /////////////////////////////////////////////////////////////////////
 
-    private Preferences prefs { private get; private set; }
+    private PreferencesWindow prefs { private get; private set; }
 
     /////////////////////////////////////////////////////////////////////
     /// Returns true, when the indicator is currently visible.
@@ -73,7 +73,7 @@ public class Indicator : GLib.Object {
             string icon = "indicator-applet";
             try {
                 path = GLib.Path.get_dirname(GLib.FileUtils.read_link("/proc/self/exe"))+"/resources";
-                icon = "gnome-pie-indicator";
+                icon = "gnome-pie";
             } catch (GLib.FileError e) {
                 warning("Failed to get path of executable!");
             }
@@ -86,23 +86,23 @@ public class Indicator : GLib.Object {
             try {
                 var file = GLib.File.new_for_path(GLib.Path.build_filename(
                     GLib.Path.get_dirname(GLib.FileUtils.read_link("/proc/self/exe"))+"/resources",
-                    "gnome-pie-indicator.svg"
+                    "gnome-pie.svg"
                 ));
 
                 if (!file.query_exists())
-                  this.indicator.set_from_icon_name("gnome-pie-indicator");
+                  this.indicator.set_from_icon_name("gnome-pie");
                 else
                   this.indicator.set_from_file(file.get_path());
             } catch (GLib.FileError e) {
                 warning("Failed to get path of executable!");
-                this.indicator.set_from_icon_name("gnome-pie-indicator");
+                this.indicator.set_from_icon_name("gnome-pie");
             }
 
             this.menu = new Gtk.Menu();
             var menu = this.menu;
         #endif
 
-        this.prefs = new Preferences();
+        this.prefs = new PreferencesWindow();
 
         // preferences item
         var item = new Gtk.ImageMenuItem.from_stock (Gtk.Stock.PREFERENCES, null);
@@ -117,7 +117,7 @@ public class Indicator : GLib.Object {
         item = new Gtk.ImageMenuItem.from_stock (Gtk.Stock.ABOUT, null);
         item.show();
         item.activate.connect(() => {
-            var about = new GnomePieAboutDialog();
+            var about = new AboutWindow();
             about.run();
             about.destroy();
         });