Merge lp:~fabianthoma/wingpanel/dconf-fixes-bug949303 into lp:~elementary-pantheon/wingpanel/old-trunk

[Fabian Thoma]

[Fabian Thoma (fabianthoma)]

review: Approve

=== modified file 'org.elementary.wingpanel.gschema.xml'
--- org.elementary.wingpanel.gschema.xml	2011-11-02 22:37:51 +0000
+++ org.elementary.wingpanel.gschema.xml	2012-04-30 18:28:18 +0000
@@ -5,10 +5,15 @@
 			<summary>List of indicators.</summary>
 			<description>These indicators will not be displayed in Wingpanel.</description>
 		</key>
-        <key type="s" name="default-launcher">
-            <default>"slingshot"</default>
-            <summary>The default program to use as App launcher.</summary>
-            <description>Description</description>
-        </key>
+		<key type="b" name="show-launcher">
+			<default>true</default>
+			<summary>Wheather to show the Applications Launcher or not.</summary>
+			<description>Wheather to show the Applications Launcher or not.</description>
+		</key>
+		<key type="s" name="default-launcher">
+			<default>"slingshot"</default>
+			<summary>The default program to use as App launcher.</summary>
+			<description>Description</description>
+		</key>
 	</schema>
 </schemalist>

=== modified file 'src/Services/IndicatorFileModel.vala'
--- src/Services/IndicatorFileModel.vala	2012-01-30 18:27:57 +0000
+++ src/Services/IndicatorFileModel.vala	2012-04-30 18:28:18 +0000
@@ -81,7 +81,11 @@
             }
 
             /* Don't load appmenu-gtk */
-            skip_list += ",libappmenu.so";
+            foreach(string blocked_indicator in Wingpanel.app.settings.blacklist) {
+                skip_list += "," + blocked_indicator;
+                log("wingpanel", LogLevelFlags.LEVEL_DEBUG, "Blacklisting %s", blocked_indicator);
+            }
+            log("wingpanel", LogLevelFlags.LEVEL_DEBUG, "Blacklisted Indicators: %s", skip_list);
 
             /* We need to look for icons in an specific location */
             //Gtk.IconTheme.get_default ().append_search_path (Wingpanel.Config.INDICATORICONSDIR);

=== modified file 'src/Settings.vala'
--- src/Settings.vala	2012-01-30 18:27:57 +0000
+++ src/Settings.vala	2012-04-30 18:28:18 +0000
@@ -22,8 +22,10 @@
 
     public class Settings : Granite.Services.Settings {
 
+        public string[] blacklist { get; set; }
+        public bool show_launcher { get; set; }
         public string default_launcher { get; set; }
-
+        
         public Settings () {
             base ("desktop.pantheon.wingpanel");
         }

=== modified file 'src/Widgets/Panel.vala'
--- src/Widgets/Panel.vala	2012-02-04 23:04:33 +0000
+++ src/Widgets/Panel.vala	2012-04-30 18:28:18 +0000
@@ -24,7 +24,7 @@
 using Granite.Services;
 
 namespace Wingpanel {
-
+    
     public enum Struts {
         LEFT,
         RIGHT,
@@ -230,11 +230,13 @@
 
         private void add_defaults () {
 
-            // Apps button
-            var apps = new Widgets.AppsButton ();
-            apps.button_press_event.connect (launch_launcher);
+            // Only show Apps button if enabled in the settings
+            if(this.app.settings.show_launcher) {
+                var apps = new Widgets.AppsButton ();
+                apps.button_press_event.connect (launch_launcher);
 
-            left_wrapper.pack_start (apps, false, true, 0);
+                left_wrapper.pack_start (apps, false, true, 0);
+            }
             container.pack_start (left_wrapper);
 
             clock = new Gtk.MenuBar ();

=== modified file 'src/WingpanelApp.vala'
--- src/WingpanelApp.vala	2012-01-30 18:27:57 +0000
+++ src/WingpanelApp.vala	2012-04-30 18:28:18 +0000
@@ -21,6 +21,8 @@
 
 namespace Wingpanel {
 
+    public WingpanelApp app;
+    
     public class WingpanelApp : Granite.Application {
 
         private Panel panel = null;
@@ -37,18 +39,18 @@
             build_version_info = Build.VERSION_INFO;
             
             program_name = "Wingpanel";
-		    exec_name = "wingpanel";
-		    app_copyright = "GPLv3";
-		    app_icon = "";
-		    app_launcher = "";
+            exec_name = "wingpanel";
+            app_copyright = "GPLv3";
+            app_icon = "";
+            app_launcher = "";
             application_id = "net.launchpad.wingpanel";
-		    main_url = "https://launchpad.net/wingpanel";
-		    bug_url = "https://bugs.launchpad.net/wingpanel";
-		    help_url = "https://answers.launchpad.net/wingpanel";
-		    translate_url = "https://translations.launchpad.net/wingpanel";
+            main_url = "https://launchpad.net/wingpanel";
+            bug_url = "https://bugs.launchpad.net/wingpanel";
+            help_url = "https://answers.launchpad.net/wingpanel";
+            translate_url = "https://translations.launchpad.net/wingpanel";
 
-		    about_authors = {"Giulio Collura <[e-mail]>"};
-		    about_artists = {"Daniel Foré <[e-mail]>"};
+            about_authors = {"Giulio Collura <[e-mail]>"};
+            about_artists = {"Daniel Foré <[e-mail]>"};
 
         }
 
@@ -83,8 +85,8 @@
         }
 
         public static int main (string[] args) {
-
-            return new WingpanelApp ().run (args);
+            Wingpanel.app = new WingpanelApp ();
+            return Wingpanel.app.run (args);
 
         }