[Xfce4-commits] <parole:master> Merge branch 'master' of ssh://git.xfce.org/apps/parole

[Sean Davis]

Updating branch refs/heads/master
         to ee16f0f2ca60d307f75a244e2d3f43d7044e3cf8 (commit)
       from 389705e7bcc206124c5716ec960291f843507a95 (commit)

commit ee16f0f2ca60d307f75a244e2d3f43d7044e3cf8
Merge: 389705e b1628f0
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Mon Nov 11 05:55:38 2013 -0500

    Merge branch 'master' of ssh://git.xfce.org/apps/parole

commit b1628f069d23ef1ebac3769e3f71d976e9b3b56e
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Mon Nov 11 10:36:43 2013 +0100

    Fix one more build-error (missing declaration)

commit 9f93b29c7fa2920626eb1b8c6c0e7d8454cbfe1d
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Mon Nov 11 10:33:42 2013 +0100

    Add missing declaration of parole_conf_dialog_enable_vis_changed_cb

commit 1768158096763a6735c06da519a06784b4c2ee62
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Mon Nov 11 10:31:48 2013 +0100

    Remove unused variable

 src/parole-conf-dialog.c |    5 +++++
 src/parole-conf.c        |    2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index b9f6091..cd34c56 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -60,6 +60,11 @@ void
 parole_conf_dialog_subtitle_encoding_changed_cb     (GtkComboBox *widget,
                                                      ParoleConfDialog *self);
 
+void
+parole_conf_dialog_enable_vis_changed_cb            (GObject *object,
+                                                     GParamSpec *pspec,
+                                                     gpointer *data);
+
 void        brightness_value_changed_cb             (GtkRange *range,
                                                      ParoleConfDialog *self);
 
diff --git a/src/parole-conf.c b/src/parole-conf.c
index 7ac6fba..a5db768 100644
--- a/src/parole-conf.c
+++ b/src/parole-conf.c
@@ -91,6 +91,8 @@ static void parole_conf_get_property    (GObject        *object,
                                          guint           prop_id,
                                          GValue         *value,
                                          GParamSpec     *pspec);
+gchar
+*parole_conf_map_xfconf_property_name   (const gchar *prop_name);
 static void parole_conf_set_property    (GObject        *object,
                                          guint           prop_id,
                                          const GValue   *value,