[geary/mjog/plugin-support] Remove notifications preference now it is unused
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/mjog/plugin-support] Remove notifications preference now it is unused
- Date: Fri, 27 Sep 2019 10:13:17 +0000 (UTC)
commit c7c135ce5bcba17826728cc09d1cc2533b7e99ea
Author: Michael Gratton <mike vee net>
Date: Fri Sep 27 19:53:58 2019 +1000
Remove notifications preference now it is unused
desktop/org.gnome.Geary.gschema.xml | 6 ----
src/client/application/geary-config.vala | 5 ----
src/client/dialogs/preferences-dialog.vala | 5 ----
ui/preferences-dialog.ui | 44 ++++++++++--------------------
4 files changed, 14 insertions(+), 46 deletions(-)
---
diff --git a/desktop/org.gnome.Geary.gschema.xml b/desktop/org.gnome.Geary.gschema.xml
index 6c9d77b5..cfae778b 100644
--- a/desktop/org.gnome.Geary.gschema.xml
+++ b/desktop/org.gnome.Geary.gschema.xml
@@ -83,12 +83,6 @@
<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>
diff --git a/src/client/application/geary-config.vala b/src/client/application/geary-config.vala
index 446b3584..99917b76 100644
--- a/src/client/application/geary-config.vala
+++ b/src/client/application/geary-config.vala
@@ -20,7 +20,6 @@ public class Configuration {
public const string AUTOSELECT_KEY = "autoselect";
public const string DISPLAY_PREVIEW_KEY = "display-preview";
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";
@@ -159,10 +158,6 @@ public class Configuration {
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); }
diff --git a/src/client/dialogs/preferences-dialog.vala b/src/client/dialogs/preferences-dialog.vala
index 41c2a8a8..fe9c02a0 100644
--- a/src/client/dialogs/preferences-dialog.vala
+++ b/src/client/dialogs/preferences-dialog.vala
@@ -19,9 +19,6 @@ public class PreferencesDialog : Gtk.Dialog {
[GtkChild]
private Gtk.CheckButton play_sounds;
- [GtkChild]
- private Gtk.CheckButton show_notifications;
-
[GtkChild]
private Gtk.CheckButton startup_notifications;
@@ -40,7 +37,6 @@ public class PreferencesDialog : Gtk.Dialog {
config.bind(Configuration.DISPLAY_PREVIEW_KEY, display_preview, "active");
config.bind(Configuration.FOLDER_LIST_PANE_HORIZONTAL_KEY, three_pane_view, "active");
config.bind(Configuration.PLAY_SOUNDS_KEY, play_sounds, "active");
- config.bind(Configuration.SHOW_NOTIFICATIONS_KEY, show_notifications, "active");
config.bind(Configuration.STARTUP_NOTIFICATIONS_KEY, startup_notifications, "active");
}
@@ -52,4 +48,3 @@ public class PreferencesDialog : Gtk.Dialog {
destroy();
}
}
-
diff --git a/ui/preferences-dialog.ui b/ui/preferences-dialog.ui
index 6a532d87..37e0c72f 100644
--- a/ui/preferences-dialog.ui
+++ b/ui/preferences-dialog.ui
@@ -1,12 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
<interface>
<requires lib="gtk+" version="3.14"/>
<template class="PreferencesDialog" parent="GtkDialog">
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="window_position">center-on-parent</property>
+ <property name="default_height">0</property>
<property name="type_hint">dialog</property>
+ <child type="titlebar">
+ <object class="GtkHeaderBar" id="header">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Preferences</property>
+ <property name="has_subtitle">False</property>
+ <property name="show_close_button">True</property>
+ </object>
+ </child>
<child internal-child="vbox">
<object class="GtkBox">
<property name="can_focus">False</property>
@@ -140,25 +150,6 @@
<property name="top_attach">5</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_start">12</property>
- <property name="margin_end">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">6</property>
- </packing>
- </child>
<child>
<object class="GtkCheckButton" id="startup_notifications">
<property name="label" translatable="yes">_Watch for new mail when closed</property>
@@ -166,6 +157,8 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Geary will keep running after all windows
are closed</property>
+ <property name="margin_left">12</property>
+ <property name="margin_right">5</property>
<property name="margin_start">12</property>
<property name="margin_end">5</property>
<property name="margin_top">5</property>
@@ -176,7 +169,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">7</property>
+ <property name="top_attach">6</property>
</packing>
</child>
</object>
@@ -188,14 +181,5 @@
</child>
</object>
</child>
- <child type="titlebar">
- <object class="GtkHeaderBar" id="header">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="title" translatable="yes">Preferences</property>
- <property name="has_subtitle">False</property>
- <property name="show_close_button">True</property>
- </object>
- </child>
</template>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]