summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--accessx-status/applet.c15
-rw-r--r--cpufreq/src/cpufreq-applet.c15
-rw-r--r--drivemount/drive-button.c9
-rw-r--r--mateweather/mateweather-applet.c19
-rw-r--r--multiload/main.c15
-rw-r--r--stickynotes/stickynotes_applet_callbacks.c11
-rw-r--r--trashapplet/src/trashapplet.c15
7 files changed, 40 insertions, 59 deletions
diff --git a/accessx-status/applet.c b/accessx-status/applet.c
index 8cbe1ff3..83e19e67 100644
--- a/accessx-status/applet.c
+++ b/accessx-status/applet.c
@@ -26,9 +26,6 @@
#include <glib-object.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#include <gdk/gdkkeysyms-compat.h>
-#endif
#include <gdk/gdkx.h>
#include <mate-panel-applet.h>
#include <X11/XKBlib.h>
@@ -1278,12 +1275,12 @@ static gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, AccessxStatu
{
switch (event->keyval)
{
- case GDK_KP_Enter:
- case GDK_ISO_Enter:
- case GDK_3270_Enter:
- case GDK_Return:
- case GDK_space:
- case GDK_KP_Space:
+ case GDK_KEY_KP_Enter:
+ case GDK_KEY_ISO_Enter:
+ case GDK_KEY_3270_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_space:
+ case GDK_KEY_KP_Space:
dialog_cb(NULL, sapplet);
return TRUE;
diff --git a/cpufreq/src/cpufreq-applet.c b/cpufreq/src/cpufreq-applet.c
index 326701a5..317a1ef7 100644
--- a/cpufreq/src/cpufreq-applet.c
+++ b/cpufreq/src/cpufreq-applet.c
@@ -25,9 +25,6 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#include <gdk/gdkkeysyms-compat.h>
-#endif
#include <gio/gio.h>
#include <mate-panel-applet.h>
#include <mate-panel-applet-gsettings.h>
@@ -582,12 +579,12 @@ cpufreq_applet_key_press (GtkWidget *widget, GdkEventKey *event)
applet = CPUFREQ_APPLET (widget);
switch (event->keyval) {
- case GDK_KP_Enter:
- case GDK_ISO_Enter:
- case GDK_3270_Enter:
- case GDK_Return:
- case GDK_space:
- case GDK_KP_Space:
+ case GDK_KEY_KP_Enter:
+ case GDK_KEY_ISO_Enter:
+ case GDK_KEY_3270_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_space:
+ case GDK_KEY_KP_Space:
cpufreq_applet_menu_popup (applet, event->time);
return TRUE;
diff --git a/drivemount/drive-button.c b/drivemount/drive-button.c
index 54daa608..07cafbe6 100644
--- a/drivemount/drive-button.c
+++ b/drivemount/drive-button.c
@@ -31,7 +31,6 @@
#include <gdk/gdkkeysyms.h>
#if GTK_CHECK_VERSION (3, 0, 0)
#include <gio/gdesktopappinfo.h>
-#include <gdk/gdkkeysyms-compat.h>
#endif
#include <string.h>
@@ -264,10 +263,10 @@ drive_button_key_press (GtkWidget *widget,
DriveButton *self = DRIVE_BUTTON (widget);
switch (event->keyval) {
- case GDK_KP_Space:
- case GDK_space:
- case GDK_KP_Enter:
- case GDK_Return:
+ case GDK_KEY_KP_Space:
+ case GDK_KEY_space:
+ case GDK_KEY_KP_Enter:
+ case GDK_KEY_Return:
drive_button_ensure_popup (self);
if (self->popup_menu) {
gtk_menu_popup (GTK_MENU (self->popup_menu), NULL, NULL,
diff --git a/mateweather/mateweather-applet.c b/mateweather/mateweather-applet.c
index 484160b5..fcaa7295 100644
--- a/mateweather/mateweather-applet.c
+++ b/mateweather/mateweather-applet.c
@@ -26,9 +26,6 @@
#include <mate-panel-applet-gsettings.h>
#include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#include <gdk/gdkkeysyms-compat.h>
-#endif
#ifdef HAVE_LIBNOTIFY
#include <libnotify/notify.h>
@@ -254,24 +251,24 @@ static gboolean
key_press_cb (GtkWidget *widget, GdkEventKey *event, MateWeatherApplet *gw_applet)
{
switch (event->keyval) {
- case GDK_u:
+ case GDK_KEY_u:
if (event->state == GDK_CONTROL_MASK) {
mateweather_update (gw_applet);
return TRUE;
}
break;
- case GDK_d:
+ case GDK_KEY_d:
if (event->state == GDK_CONTROL_MASK) {
details_cb (NULL, gw_applet);
return TRUE;
}
break;
- case GDK_KP_Enter:
- case GDK_ISO_Enter:
- case GDK_3270_Enter:
- case GDK_Return:
- case GDK_space:
- case GDK_KP_Space:
+ case GDK_KEY_KP_Enter:
+ case GDK_KEY_ISO_Enter:
+ case GDK_KEY_3270_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_space:
+ case GDK_KEY_KP_Space:
details_cb (NULL, gw_applet);
return TRUE;
default:
diff --git a/multiload/main.c b/multiload/main.c
index a3203fcc..72edd44f 100644
--- a/multiload/main.c
+++ b/multiload/main.c
@@ -21,9 +21,6 @@
#include <glibtop.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#include <gdk/gdkkeysyms-compat.h>
-#endif
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gio/gio.h>
#include <gio/gdesktopappinfo.h>
@@ -236,12 +233,12 @@ multiload_key_press_event_cb (GtkWidget *widget, GdkEventKey *event, MultiloadAp
switch (event->keyval) {
/* this list of keyvals taken from mixer applet, which seemed to have
a good list of keys to use */
- case GDK_KP_Enter:
- case GDK_ISO_Enter:
- case GDK_3270_Enter:
- case GDK_Return:
- case GDK_space:
- case GDK_KP_Space:
+ case GDK_KEY_KP_Enter:
+ case GDK_KEY_ISO_Enter:
+ case GDK_KEY_3270_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_space:
+ case GDK_KEY_KP_Space:
/* activate */
start_procman (ma);
return TRUE;
diff --git a/stickynotes/stickynotes_applet_callbacks.c b/stickynotes/stickynotes_applet_callbacks.c
index 9defba8a..bb5d2448 100644
--- a/stickynotes/stickynotes_applet_callbacks.c
+++ b/stickynotes/stickynotes_applet_callbacks.c
@@ -22,9 +22,6 @@
#include "stickynotes_applet_callbacks.h"
#include "stickynotes.h"
#include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#include <gdk/gdkkeysyms-compat.h>
-#endif
#include <X11/Xatom.h>
#include <gdk/gdkx.h>
#include <libmate-desktop/mate-aboutdialog.h>
@@ -114,10 +111,10 @@ applet_key_cb (GtkWidget *widget,
{
switch (event->keyval)
{
- case GDK_KP_Space:
- case GDK_space:
- case GDK_KP_Enter:
- case GDK_Return:
+ case GDK_KEY_KP_Space:
+ case GDK_KEY_space:
+ case GDK_KEY_KP_Enter:
+ case GDK_KEY_Return:
stickynote_show_notes (TRUE);
return TRUE;
}
diff --git a/trashapplet/src/trashapplet.c b/trashapplet/src/trashapplet.c
index f3372b17..c159a93f 100644
--- a/trashapplet/src/trashapplet.c
+++ b/trashapplet/src/trashapplet.c
@@ -30,9 +30,6 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#include <gdk/gdkkeysyms-compat.h>
-#endif
#include <gio/gio.h>
#include <libmate-desktop/mate-aboutdialog.h>
#include <mate-panel-applet.h>
@@ -287,12 +284,12 @@ trash_applet_key_press (GtkWidget *widget,
switch (event->keyval)
{
- case GDK_KP_Enter:
- case GDK_ISO_Enter:
- case GDK_3270_Enter:
- case GDK_Return:
- case GDK_space:
- case GDK_KP_Space:
+ case GDK_KEY_KP_Enter:
+ case GDK_KEY_ISO_Enter:
+ case GDK_KEY_3270_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_space:
+ case GDK_KEY_KP_Space:
trash_applet_open_folder (NULL, applet);
return TRUE;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-03 22:20:36 +0000