[Xfce4-commits] [apps/xfce4-notifyd] 10/29: Fix fadeout and primary-monitor options in config

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

ochosi pushed a commit to branch master
in repository apps/xfce4-notifyd.

commit 83b39fa0171cc1469c27cbd1d112c14810b7a4af
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Tue Jan 3 23:23:23 2017 +0100

    Fix fadeout and primary-monitor options in config
---
 xfce4-notifyd-config/main.c                     | 13 ++++++++++++-
 xfce4-notifyd-config/xfce4-notifyd-config.glade |  4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/xfce4-notifyd-config/main.c b/xfce4-notifyd-config/main.c
index 23d79c0..14d359a 100644
--- a/xfce4-notifyd-config/main.c
+++ b/xfce4-notifyd-config/main.c
@@ -617,6 +617,8 @@ xfce4_notifyd_config_setup_dialog(GtkBuilder *builder)
     GtkWidget *log_listbox;
     GtkWidget *clear_log_button;
     GtkWidget *refresh_log_button;
+    GtkWidget *primary_monitor;
+    GtkWidget *do_fadeout;
     GtkAdjustment *adj;
     GError *error = NULL;
     gchar *current_theme;
@@ -678,6 +680,15 @@ xfce4_notifyd_config_setup_dialog(GtkBuilder *builder)
     if(gtk_combo_box_get_active(GTK_COMBO_BOX(position_combo)) == -1)
         gtk_combo_box_set_active(GTK_COMBO_BOX(position_combo), GTK_CORNER_TOP_RIGHT);
 
+    primary_monitor = GTK_WIDGET(gtk_builder_get_object(builder, "primary_monitor"));
+    xfconf_g_property_bind(channel, "/primary-monitor", G_TYPE_BOOLEAN,
+                           G_OBJECT(primary_monitor), "active");
+
+    do_fadeout = GTK_WIDGET(gtk_builder_get_object(builder, "do_fadeout"));
+    xfconf_g_property_bind(channel, "/do-fadeout", G_TYPE_BOOLEAN,
+                          G_OBJECT(do_fadeout), "active");
+
+
     do_not_disturb_switch = GTK_WIDGET (gtk_builder_get_object (builder, "do_not_disturb"));
     xfconf_g_property_bind (channel, "/do-not-disturb", G_TYPE_BOOLEAN,
                             G_OBJECT (do_not_disturb_switch), "active");
@@ -706,7 +717,7 @@ xfce4_notifyd_config_setup_dialog(GtkBuilder *builder)
     g_signal_connect (G_OBJECT (channel),
                       "property-changed::" KNOWN_APPLICATIONS_PROP,
                       G_CALLBACK (xfce4_notifyd_known_applications_changed), known_applications_listbox);
-// TODO: Properly initialize fadeout switch
+
     /* Notification log settings */
     notify_notebook = GTK_WIDGET (gtk_builder_get_object (builder, "notify_notebook"));
     log_widgets.log_tab = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notify_notebook), -1);
diff --git a/xfce4-notifyd-config/xfce4-notifyd-config.glade b/xfce4-notifyd-config/xfce4-notifyd-config.glade
index 5b3f7a8..cb7e6f6 100644
--- a/xfce4-notifyd-config/xfce4-notifyd-config.glade
+++ b/xfce4-notifyd-config/xfce4-notifyd-config.glade
@@ -306,7 +306,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSwitch" id="primary_switch">
+                      <object class="GtkSwitch" id="primary_monitor">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="halign">end</property>
@@ -573,7 +573,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSwitch" id="switch2">
+                      <object class="GtkSwitch" id="do_fadeout">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="halign">end</property>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.