diff options
| author | Bastien Nocera <hadess@hadess.net> | 2020-08-22 00:37:41 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2020-08-22 01:39:00 +0200 |
| commit | d05aa23ee0adad3888c0d6b291c3ec9b29be2191 (patch) | |
| tree | 7ec23b52a31c01b2c3fffdd5304cd6547aaff5eb | |
| parent | 0ed1d793feade5f9e8a28a82f1fe1e00456f3b37 (diff) | |
| download | totem-d05aa23ee0adad3888c0d6b291c3ec9b29be2191.tar.gz | |
main: Re-indent window_key_press_event_cb()
Looks like artistic indentation from the noughties.
| -rw-r--r-- | src/totem-object.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/totem-object.c b/src/totem-object.c index 102f3e919..803edaf1e 100644 --- a/src/totem-object.c +++ b/src/totem-object.c @@ -3554,7 +3554,7 @@ window_key_press_event_cb (GtkWidget *win, GdkEventKey *event, TotemObject *tote return FALSE; /* Handle Quit */ - if (event->state & GDK_CONTROL_MASK && + if ((event->state & GDK_CONTROL_MASK) && event->type == GDK_KEY_PRESS && (event->keyval == GDK_KEY_Q || event->keyval == GDK_KEY_q)) { @@ -3562,7 +3562,7 @@ window_key_press_event_cb (GtkWidget *win, GdkEventKey *event, TotemObject *tote } /* Handle back/quit */ - if (event->state & GDK_CONTROL_MASK && + if ((event->state & GDK_CONTROL_MASK) && event->type == GDK_KEY_PRESS && (event->keyval == GDK_KEY_W || event->keyval == GDK_KEY_w)) { @@ -3580,8 +3580,7 @@ window_key_press_event_cb (GtkWidget *win, GdkEventKey *event, TotemObject *tote /* Special case Eject, Open, Open URI, * seeking and zoom keyboard shortcuts */ - if (event->state != 0 - && (event->state & GDK_CONTROL_MASK)) + if (event->state != 0 && (event->state & GDK_CONTROL_MASK)) { switch (event->keyval) { case GDK_KEY_E: @@ -3618,15 +3617,14 @@ window_key_press_event_cb (GtkWidget *win, GdkEventKey *event, TotemObject *tote } } - /* If we have modifiers, and either Ctrl, Mod1 (Alt), or any * of Mod3 to Mod5 (Mod2 is num-lock...) are pressed, we * let Gtk+ handle the key */ - if (event->state != 0 - && ((event->state & GDK_CONTROL_MASK) - || (event->state & GDK_MOD1_MASK) - || (event->state & GDK_MOD3_MASK) - || (event->state & GDK_MOD4_MASK))) + if (event->state != 0 && + ((event->state & GDK_CONTROL_MASK) || + (event->state & GDK_MOD1_MASK) || + (event->state & GDK_MOD3_MASK) || + (event->state & GDK_MOD4_MASK))) return FALSE; if (event->type == GDK_KEY_PRESS) |