[Commits] [SCM] claws branch, master, updated. 3.16.0-55-g23d736d
ticho at claws-mail.org
ticho at claws-mail.org
Fri Feb 9 21:36:29 CET 2018
The branch, master has been updated
via 23d736d384c0a447f0156265c374625b9ad63ebe (commit)
from 80360594f0d55125e97a4831e46fea08b08e95be (commit)
Summary of changes:
src/plugins/att_remover/att_remover.c | 2 +-
src/plugins/fancy/fancy_viewer.c | 6 +++---
.../notification/gtkhotkey/x11/eggaccelerators.c | 18 +++++++++---------
src/plugins/notification/notification_foldercheck.c | 2 +-
src/plugins/python/python-shell.c | 10 +++++-----
src/plugins/rssyl/rssyl_feed_props.c | 6 +++---
src/plugins/vcalendar/vcal_meeting_gtk.c | 2 +-
7 files changed, 23 insertions(+), 23 deletions(-)
- Log -----------------------------------------------------------------
commit 23d736d384c0a447f0156265c374625b9ad63ebe
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Fri Feb 9 21:15:01 2018 +0100
Fix few forgotten GDK_ to GDK_KEY_ renames in plugins.
diff --git a/src/plugins/att_remover/att_remover.c b/src/plugins/att_remover/att_remover.c
index b8a3cde..4684a29 100644
--- a/src/plugins/att_remover/att_remover.c
+++ b/src/plugins/att_remover/att_remover.c
@@ -87,7 +87,7 @@ static MimeInfo *find_first_text_part(MimeInfo *partinfo)
static gboolean key_pressed_cb(GtkWidget *widget, GdkEventKey *event,
AttRemover *attremover)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
gtk_widget_destroy(attremover->window);
return FALSE;
diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
index 08c0044..4ecb918 100644
--- a/src/plugins/fancy/fancy_viewer.c
+++ b/src/plugins/fancy/fancy_viewer.c
@@ -853,13 +853,13 @@ static gint keypress_events_cb (GtkWidget *widget, GdkEventKey *event,
{
if (event->state == CTRL_KEY) {
switch (event->keyval) {
- case GDK_plus:
+ case GDK_KEY_plus:
zoom_in_cb(viewer->ev_zoom_in, NULL, viewer);
break;
- case GDK_period:
+ case GDK_KEY_period:
zoom_100_cb(viewer->ev_zoom_100, NULL, viewer);
break;
- case GDK_minus:
+ case GDK_KEY_minus:
zoom_out_cb(viewer->ev_zoom_out, NULL, viewer);
break;
}
diff --git a/src/plugins/notification/gtkhotkey/x11/eggaccelerators.c b/src/plugins/notification/gtkhotkey/x11/eggaccelerators.c
index ca63e78..10e8e52 100644
--- a/src/plugins/notification/gtkhotkey/x11/eggaccelerators.c
+++ b/src/plugins/notification/gtkhotkey/x11/eggaccelerators.c
@@ -579,20 +579,20 @@ reload_modmap (GdkKeymap *keymap,
j = 0;
while (j < n_entries)
{
- if (keyvals[j] == GDK_Num_Lock)
+ if (keyvals[j] == GDK_KEY_Num_Lock)
mask |= EGG_VIRTUAL_NUM_LOCK_MASK;
- else if (keyvals[j] == GDK_Scroll_Lock)
+ else if (keyvals[j] == GDK_KEY_Scroll_Lock)
mask |= EGG_VIRTUAL_SCROLL_LOCK_MASK;
- else if (keyvals[j] == GDK_Meta_L ||
- keyvals[j] == GDK_Meta_R)
+ else if (keyvals[j] == GDK_KEY_Meta_L ||
+ keyvals[j] == GDK_KEY_Meta_R)
mask |= EGG_VIRTUAL_META_MASK;
- else if (keyvals[j] == GDK_Hyper_L ||
- keyvals[j] == GDK_Hyper_R)
+ else if (keyvals[j] == GDK_KEY_Hyper_L ||
+ keyvals[j] == GDK_KEY_Hyper_R)
mask |= EGG_VIRTUAL_HYPER_MASK;
- else if (keyvals[j] == GDK_Super_L ||
- keyvals[j] == GDK_Super_R)
+ else if (keyvals[j] == GDK_KEY_Super_L ||
+ keyvals[j] == GDK_KEY_Super_R)
mask |= EGG_VIRTUAL_SUPER_MASK;
- else if (keyvals[j] == GDK_Mode_switch)
+ else if (keyvals[j] == GDK_KEY_Mode_switch)
mask |= EGG_VIRTUAL_MODE_SWITCH_MASK;
++j;
diff --git a/src/plugins/notification/notification_foldercheck.c b/src/plugins/notification/notification_foldercheck.c
index b9e13a8..80d6898 100644
--- a/src/plugins/notification/notification_foldercheck.c
+++ b/src/plugins/notification/notification_foldercheck.c
@@ -984,7 +984,7 @@ static gboolean my_folder_update_hook(gpointer source, gpointer data)
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if(event && (event->keyval == GDK_Escape)) {
+ if(event && (event->keyval == GDK_KEY_Escape)) {
foldercheck_cancel(NULL, data);
return TRUE;
}
diff --git a/src/plugins/python/python-shell.c b/src/plugins/python/python-shell.c
index 4ecd3c9..de98d97 100644
--- a/src/plugins/python/python-shell.c
+++ b/src/plugins/python/python-shell.c
@@ -332,18 +332,18 @@ parasite_python_shell_key_press_cb(GtkWidget *textview,
GdkEventKey *event,
GtkWidget *python_shell)
{
- if (event->keyval == GDK_Return)
+ if (event->keyval == GDK_KEY_Return)
{
parasite_python_shell_process_line(python_shell);
return TRUE;
}
- else if (event->keyval == GDK_Up)
+ else if (event->keyval == GDK_KEY_Up)
{
parasite_python_shell_replace_input(python_shell,
parasite_python_shell_get_history_back(python_shell));
return TRUE;
}
- else if (event->keyval == GDK_Down)
+ else if (event->keyval == GDK_KEY_Down)
{
parasite_python_shell_replace_input(python_shell,
parasite_python_shell_get_history_forward(python_shell));
@@ -377,8 +377,8 @@ parasite_python_shell_key_press_cb(GtkWidget *textview,
&selection_iter);
if (cmp_start_insert == 0 && cmp_start_select == 0 &&
- (event->keyval == GDK_BackSpace ||
- event->keyval == GDK_Left))
+ (event->keyval == GDK_KEY_BackSpace ||
+ event->keyval == GDK_KEY_Left))
{
return TRUE;
}
diff --git a/src/plugins/rssyl/rssyl_feed_props.c b/src/plugins/rssyl/rssyl_feed_props.c
index 14e80f4..a43defe 100644
--- a/src/plugins/rssyl/rssyl_feed_props.c
+++ b/src/plugins/rssyl/rssyl_feed_props.c
@@ -211,11 +211,11 @@ rssyl_props_key_press_cb(GtkWidget *widget, GdkEventKey *event,
{
if (event) {
switch (event->keyval) {
- case GDK_Escape:
+ case GDK_KEY_Escape:
rssyl_props_cancel_cb(widget, data);
return TRUE;
- case GDK_Return:
- case GDK_KP_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_KP_Enter:
rssyl_props_ok_cb(widget, data);
return TRUE;
default:
diff --git a/src/plugins/vcalendar/vcal_meeting_gtk.c b/src/plugins/vcalendar/vcal_meeting_gtk.c
index eeae380..967ac8c 100644
--- a/src/plugins/vcalendar/vcal_meeting_gtk.c
+++ b/src/plugins/vcalendar/vcal_meeting_gtk.c
@@ -529,7 +529,7 @@ static gboolean meeting_key_pressed(GtkWidget *widget,
{
VCalMeeting *meet = (VCalMeeting *)data;
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
vcal_destroy(meet);
}
return FALSE;
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list