[Xfce4-commits] [apps/parole] 01/01: Fix full debug builds and resolve implicit-fallthrough

[noreply at xfce.org]

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

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/parole.

commit 4e4801f50ac645d4f1ec9a2106a4364e43f0a4dd
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Wed Feb 28 19:39:16 2018 -0500

    Fix full debug builds and resolve implicit-fallthrough
---
 src/common/parole-common.c | 6 ++++++
 src/parole-button.c        | 5 +++++
 src/parole-conf-dialog.c   | 8 ++++++--
 src/parole-player.c        | 2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/common/parole-common.c b/src/common/parole-common.c
index de999b0..1de4f54 100644
--- a/src/common/parole-common.c
+++ b/src/common/parole-common.c
@@ -101,7 +101,9 @@ void parole_window_busy_cursor(GdkWindow *window) {
     if (cursor)
         g_object_unref(cursor);
 
+    G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     gdk_flush();
+    G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 void parole_window_invisible_cursor(GdkWindow *window) {
@@ -117,7 +119,9 @@ void parole_window_invisible_cursor(GdkWindow *window) {
     if (cursor)
         g_object_unref(cursor);
 
+    G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     gdk_flush();
+    G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 void parole_window_normal_cursor(GdkWindow *window) {
@@ -126,5 +130,7 @@ void parole_window_normal_cursor(GdkWindow *window) {
 
     gdk_window_set_cursor(window, NULL);
 
+    G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     gdk_flush();
+    G_GNUC_END_IGNORE_DEPRECATIONS
 }
diff --git a/src/parole-button.c b/src/parole-button.c
index 5924f7d..0333de2 100644
--- a/src/parole-button.c
+++ b/src/parole-button.c
@@ -147,7 +147,9 @@ parole_button_grab_keystring(ParoleButton *button, guint keycode) {
 
     display = gdk_display_get_default();
 
+    G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     gdk_error_trap_push();
+    G_GNUC_END_IGNORE_DEPRECATIONS
 
     ret = XGrabKey(GDK_DISPLAY_XDISPLAY(display), keycode, modmask,
                     gdk_x11_window_get_xid(button->priv->window), True,
@@ -169,8 +171,11 @@ parole_button_grab_keystring(ParoleButton *button, guint keycode) {
         return FALSE;
     }
 
+    G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     gdk_flush();
     gdk_error_trap_pop_ignored();
+    G_GNUC_END_IGNORE_DEPRECATIONS
+
     return TRUE;
 }
 
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index 84629d3..ab40b54 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -230,9 +230,11 @@ void parole_conf_dialog_sink_plugin_changed_cb(GtkComboBox *widget,  ParoleConfD
 
 /* Change subtitle font */
 void parole_conf_dialog_font_set_cb(GtkFontButton *button, ParoleConfDialog *self) {
+    G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     g_object_set(G_OBJECT(self->priv->conf),
-                  "subtitle-font", gtk_font_button_get_font_name(button),
-                  NULL);
+                 "subtitle-font", gtk_font_button_get_font_name(button),
+                 NULL);
+    G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 /* Finalize the dialog */
@@ -383,7 +385,9 @@ parole_conf_dialog_set_defaults(ParoleConfDialog *self) {
 
     parole_subtitle_encoding_set(GTK_COMBO_BOX(self->priv->encoding), subtitle_encoding);
 
+    G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     gtk_font_button_set_font_name(GTK_FONT_BUTTON(self->priv->font_button), subtitle_font);
+    G_GNUC_END_IGNORE_DEPRECATIONS
 
     g_free(subtitle_font);
     g_free(subtitle_encoding);
diff --git a/src/parole-player.c b/src/parole-player.c
index 3181ed7..97e9983 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2623,8 +2623,8 @@ parole_player_handle_key_press(GdkEventKey *ev, ParolePlayer *player) {
             if (ev->state & GDK_CONTROL_MASK) {
                 parole_player_quit(player);
                 ret_val = TRUE;
-                break;
             }
+            break;
 #ifdef HAVE_XF86_KEYSYM
         case XF86XK_OpenURL:
             parole_player_full_screen(player, FALSE);

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