Merge lp:~elementary-apps/pantheon-mail/remove-notify-prefs into lp:~elementary-apps/pantheon-mail/trunk

[Danielle Foré]

Remove notification preferences

Notification preferences are handled in Switchboard now

[lp:~elementary-apps/pantheon-mail/remove-notify-prefs]

1870. By Danielle Foré on 2015-11-23

Remove notification preferences

[kay van der Zander (kay20)]

review: Approve

=== modified file 'data/org.yorba.geary.gschema.xml'
--- data/org.yorba.geary.gschema.xml	2015-03-10 23:08:59 +0000
+++ data/org.yorba.geary.gschema.xml	2015-11-23 01:32:24 +0000
@@ -73,16 +73,6 @@
         <summary>enable inline spell checking</summary>
         <description>True to spell check while typing.</description>
     </key>
-    <key name="play-sounds" type="b">
-        <default>true</default>
-        <summary>enable notification sounds</summary>
-        <description>True to play sounds for notifications and sending.</description>
-    </key>
-    <key name="show-notifications" type="b">
-        <default>true</default>
-        <summary>show notifications for new mail</summary>
-        <description>True to show notification bubbles.</description>
-    </key>
     <key name="startup-notifications" type="b">
         <default>false</default>
         <summary>notify of new mail at startup</summary>

=== modified file 'data/ui/preferences.glade'
--- data/ui/preferences.glade	2015-03-11 00:35:07 +0000
+++ data/ui/preferences.glade	2015-11-23 01:32:24 +0000
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="dialog">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
+    <property name="resizable">False</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -158,44 +160,6 @@
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="play_sounds">
-                <property name="label" translatable="yes">_Play notification sounds</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="margin_left">12</property>
-                <property name="margin_right">5</property>
-                <property name="margin_top">5</property>
-                <property name="margin_bottom">5</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">7</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="show_notifications">
-                <property name="label" translatable="yes">Show _notifications for new mail</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="margin_left">12</property>
-                <property name="margin_right">5</property>
-                <property name="margin_top">5</property>
-                <property name="margin_bottom">5</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">8</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkCheckButton" id="startup_notifications">
                 <property name="label" translatable="yes">Always _watch for new mail</property>
                 <property name="visible">True</property>
@@ -212,12 +176,9 @@
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">9</property>
+                <property name="top_attach">7</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -227,13 +188,5 @@
         </child>
       </object>
     </child>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="headerbar">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="title" translatable="yes">Preferences</property>
-        <property name="show_close_button">True</property>
-      </object>
-    </child>
   </object>
 </interface>

=== modified file 'src/client/application/geary-config.vala'
--- src/client/application/geary-config.vala	2015-03-10 23:08:59 +0000
+++ src/client/application/geary-config.vala	2015-11-23 01:32:24 +0000
@@ -18,8 +18,6 @@
     public const string AUTOSELECT_KEY = "autoselect";
     public const string DISPLAY_PREVIEW_KEY = "display-preview";
     public const string SPELL_CHECK_KEY = "spell-check";
-    public const string PLAY_SOUNDS_KEY = "play-sounds";
-    public const string SHOW_NOTIFICATIONS_KEY = "show-notifications";
     public const string STARTUP_NOTIFICATIONS_KEY = "startup-notifications";
     public const string ASK_OPEN_ATTACHMENT_KEY = "ask-open-attachment";
     public const string COMPOSE_AS_HTML_KEY = "compose-as-html";
@@ -79,14 +77,6 @@
         get { return settings.get_boolean(SPELL_CHECK_KEY); }
     }
 
-    public bool play_sounds {
-        get { return settings.get_boolean(PLAY_SOUNDS_KEY); }
-    }
-
-    public bool show_notifications {
-        get { return settings.get_boolean(SHOW_NOTIFICATIONS_KEY); }
-    }
-
     public bool startup_notifications {
         get { return settings.get_boolean(STARTUP_NOTIFICATIONS_KEY); }
         set { set_boolean(STARTUP_NOTIFICATIONS_KEY, value); }

=== modified file 'src/client/dialogs/preferences-dialog.vala'
--- src/client/dialogs/preferences-dialog.vala	2015-03-10 23:08:59 +0000
+++ src/client/dialogs/preferences-dialog.vala	2015-11-23 01:32:24 +0000
@@ -21,8 +21,6 @@
         config.bind(Configuration.FOLDER_LIST_PANE_HORIZONTAL_KEY,
             builder.get_object("three_pane_view"), "active");
         config.bind(Configuration.SPELL_CHECK_KEY, builder.get_object("spell_check"), "active");
-        config.bind(Configuration.PLAY_SOUNDS_KEY, builder.get_object("play_sounds"), "active");
-        config.bind(Configuration.SHOW_NOTIFICATIONS_KEY, builder.get_object("show_notifications"), "active");
         config.bind(Configuration.STARTUP_NOTIFICATIONS_KEY, builder.get_object("startup_notifications"), "active");
     }
     

=== modified file 'src/client/notification/libmessagingmenu.vala'
--- src/client/notification/libmessagingmenu.vala	2015-02-06 20:43:33 +0000
+++ src/client/notification/libmessagingmenu.vala	2015-11-23 01:32:24 +0000
@@ -63,7 +63,7 @@
     }
     
     private void show_new_messages_count(Geary.Folder folder, int count) {
-        if (!GearyApplication.instance.config.show_notifications || !monitor.should_notify_new_messages(folder))
+        if (!monitor.should_notify_new_messages(folder))
             return;
         
         string source_id = get_source_id(folder);

=== modified file 'src/client/notification/libnotify.vala'
--- src/client/notification/libnotify.vala	2015-02-06 20:43:33 +0000
+++ src/client/notification/libnotify.vala	2015-11-23 01:32:24 +0000
@@ -65,8 +65,7 @@
         this.folder = null;
         email = null;
         
-        if (!GearyApplication.instance.config.show_notifications ||
-            !monitor.should_notify_new_messages(folder))
+        if (!monitor.should_notify_new_messages(folder))
             return;
         
         string body = ngettext("%d new message", "%d new messages", added).printf(added);
@@ -87,10 +86,9 @@
         this.folder = folder;
         this.email = email;
         
-        if (!GearyApplication.instance.config.show_notifications ||
-            !monitor.should_notify_new_messages(folder))
+        if (!monitor.should_notify_new_messages(folder))
             return;
-        
+
         // possible to receive email with no originator
         Geary.RFC822.MailboxAddress? primary = email.get_primary_originator();
         if (primary == null) {
@@ -183,9 +181,6 @@
     }
     
     public static void play_sound(string sound) {
-        if (!GearyApplication.instance.config.play_sounds)
-            return;
-        
         init_sound();
         sound_context.play(0, Canberra.PROP_EVENT_ID, sound);
     }