diff --git a/Makefile.am b/Makefile.am index 18b0d3e546d7a5569a98e5fa6b2a0b8517243cb1..fe87266297bb775ab7c7edaa7df17b716a3b04bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,6 +34,7 @@ DISTCLEANFILES = \ intltool-merge \ intltool-update \ ./po/.intltool-merge-cache \ + ./po/.intltool-merge-cache.lock \ $(NULL) MAINTAINERCLEANFILES = \ diff --git a/configure.ac b/configure.ac index c78ff5fb8612fef6be31dd6148fe43a91e7f0a3a..cef8cc4273edd35cae5b5084d14909b7990833dd 100644 --- a/configure.ac +++ b/configure.ac @@ -22,11 +22,8 @@ AC_SUBST(AR_FLAGS, [cr]) IT_PROG_INTLTOOL([0.50.1]) AC_PROG_CC AM_PROG_CC_C_O -AC_STDC_HEADERS AC_CANONICAL_HOST -AC_HEADER_STDC - LT_PREREQ([2.4]) LT_INIT([disable-static]) @@ -39,8 +36,6 @@ GETTEXT_PACKAGE=xfce4-screensaver AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of default gettext domain]) -AM_GLIB_GNU_GETTEXT - dnl dnl Enable gsettings schema macros dnl @@ -191,7 +186,7 @@ dnl --------------------------------------------------------------------------- dnl - Where should we put documentation ? dnl --------------------------------------------------------------------------- AC_ARG_WITH(doc-dir, - [AC_HELP_STRING([--with-doc-dir=], + [AS_HELP_STRING([--with-doc-dir=], [directory to install documentation])]) if ! test -z "$with_doc_dir"; then DOCDIR="$with_doc_dir/xfce4-screensaver-$VERSION" @@ -241,7 +236,7 @@ AC_DEFUN([AC_CHECK_X_HEADER], [ AC_CHECK_HEADER([$1],[$2],[$3],[$4]) CPPFLAGS="$ac_save_CPPFLAGS"]) -# Like AC_TRY_COMPILE, but it uses the already-computed -I directories. +# Like AC_COMPILE_IFELSE, but it uses the already-computed -I directories. # AC_DEFUN([AC_TRY_X_COMPILE], [ ac_save_CPPFLAGS="$CPPFLAGS" @@ -249,7 +244,7 @@ AC_DEFUN([AC_TRY_X_COMPILE], [ CPPFLAGS="$CPPFLAGS -I$includedir" fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" - AC_TRY_COMPILE([$1], [$2], [$3], [$4]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$1]], [[$2]])], [$3], [$4]) CPPFLAGS="$ac_save_CPPFLAGS"]) @@ -426,7 +421,7 @@ fi # Check whether to use a xscreensaver hacks configuration directory AC_MSG_CHECKING([whether to use xscreensaver hacks configuration]) -AC_ARG_WITH(xscreensaverdir, AC_HELP_STRING([--with-xscreensaverdir=dir], [Use xscreensaver hack configs found in directory],)) +AC_ARG_WITH(xscreensaverdir, AS_HELP_STRING([--with-xscreensaverdir=dir], [Use xscreensaver hack configs found in directory],)) xscreensaverdir= if test "x$with_xscreensaverdir" = "xyes"; then if test -d /usr/share/xscreensaver/config; then @@ -448,7 +443,7 @@ else fi # Path to xscreensaver hack executables -AC_ARG_WITH(xscreensaverhackdir, AC_HELP_STRING([--with-xscreensaverhackdir=dir], [Look for xscreensaver hack executables in directory],)) +AC_ARG_WITH(xscreensaverhackdir, AS_HELP_STRING([--with-xscreensaverhackdir=dir], [Look for xscreensaver hack executables in directory],)) AC_MSG_CHECKING([for location of xscreensaver hack executables]) xscreensaverhackdir= if test "x$with_xscreensaverhackdir" = "xyes" -o "x$with_xscreensaverhackdir" = "x"; then @@ -543,7 +538,7 @@ dnl - Check for PAM dnl --------------------------------------------------------------------------- have_pam=no -AC_ARG_ENABLE(pam, AC_HELP_STRING([--enable-pam], +AC_ARG_ENABLE(pam, AS_HELP_STRING([--enable-pam], [Enable PAM support @<:@default=auto@:>@], ),,enable_pam=auto) @@ -564,20 +559,33 @@ if test "x$have_pam" = "xyes"; then AC_MSG_CHECKING(how to call pam_strerror) AC_CACHE_VAL(ac_cv_pam_strerror_args, - [AC_TRY_COMPILE([#include - #include - #include ], - [pam_handle_t *pamh = 0; - const char *s = pam_strerror(pamh, PAM_SUCCESS);], - [ac_pam_strerror_args=2], - [AC_TRY_COMPILE([#include - #include - #include ], - [char *s = - pam_strerror(PAM_SUCCESS);], - [ac_pam_strerror_args=1], - [ac_pam_strerror_args=0])]) - ac_cv_pam_strerror_args=$ac_pam_strerror_args]) + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #include + #include + ]], + [[pam_handle_t *pamh = 0; + const char *s = pam_strerror(pamh, PAM_SUCCESS); + ]] + )], + [ac_pam_strerror_args=2], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #include + #include + ]], + [[char *s = + pam_strerror(PAM_SUCCESS); + ]] + )], + [ac_pam_strerror_args=1], + [ac_pam_strerror_args=0] + )] + ) + ac_cv_pam_strerror_args=$ac_pam_strerror_args] + ) ac_pam_strerror_args=$ac_cv_pam_strerror_args if test "$ac_pam_strerror_args" = 1 ; then AC_MSG_RESULT(one argument) @@ -1018,7 +1026,7 @@ exec_prefix=$old_exec_prefix # Turn on the additional warnings last, so -Werror doesn't affect other tests. AC_ARG_ENABLE(more-warnings, - AC_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]), + AS_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]), set_more_warnings="$enableval",[ if test -d $srcdir/.git; then is_cvs_version=true @@ -1041,9 +1049,9 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $option" AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], + has_option=yes, + has_option=no,) if test $has_option = no; then CFLAGS="$SAVE_CFLAGS" fi @@ -1059,7 +1067,7 @@ fi # # Enable Debug # -AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug=[no/yes]], [turn on debugging])],, enable_debug=yes) +AC_ARG_ENABLE(debug, [AS_HELP_STRING([--enable-debug=[no/yes]], [turn on debugging])],, enable_debug=yes) if test "$enable_debug" = "yes"; then DEBUG_CFLAGS="-DG_ENABLE_DEBUG" else @@ -1102,7 +1110,7 @@ AC_SUBST(themesdir) # Files -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile po/Makefile.in src/Makefile @@ -1121,8 +1129,8 @@ data/images/Makefile savers/Makefile doc/Makefile doc/xfce4-screensaver.xml - ]) +AC_OUTPUT echo " xfce4-screensaver $VERSION diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 6086a8d1fa02f412c411cca5fd79244f9b9fb5de..a51ffa6321f6986179be9843f245e99cddf2bbad 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = \ scalable \ 16x16 \ 24x24 \ - 32x32 \ + 32x32 \ 48x48 \ 128x128 diff --git a/savers/floaters.c b/savers/floaters.c index b51537eb9e7a5499d7ff92f0809408b970a02e8a..6292a092aa935f0d9e01c8ab12e21fe79c59890e 100644 --- a/savers/floaters.c +++ b/savers/floaters.c @@ -260,9 +260,9 @@ static void cached_source_free (CachedSource *source); static ScreenSaver *screen_saver_new (GtkWidget *drawing_area, const gchar *filename, - gint max_floater_count, - gboolean should_do_rotations, - gboolean should_show_paths); + gint local_max_floater_count, + gboolean local_should_do_rotations, + gboolean local_should_show_paths); static void screen_saver_free (ScreenSaver *screen_saver); static gdouble screen_saver_get_timestamp (ScreenSaver *screen_saver); static void screen_saver_get_initial_state (ScreenSaver *screen_saver); @@ -794,9 +794,9 @@ screen_saver_floater_do_draw (ScreenSaver *screen_saver, static ScreenSaver * screen_saver_new (GtkWidget *drawing_area, const gchar *filename, - gint max_floater_count, - gboolean should_do_rotations, - gboolean should_show_paths) { + gint local_max_floater_count, + gboolean local_should_do_rotations, + gboolean local_should_show_paths) { ScreenSaver *screen_saver; screen_saver = g_new (ScreenSaver, 1); @@ -822,10 +822,10 @@ screen_saver_new (GtkWidget *drawing_area, screen_saver->updates_per_second = 0.0; screen_saver->frames_per_second = 0.0; screen_saver->floaters = NULL; - screen_saver->max_floater_count = max_floater_count; + screen_saver->max_floater_count = local_max_floater_count; - screen_saver->should_show_paths = should_show_paths; - screen_saver->should_do_rotations = should_do_rotations; + screen_saver->should_show_paths = local_should_show_paths; + screen_saver->should_do_rotations = local_should_do_rotations; screen_saver->draw_ops_pending = TRUE; screen_saver_get_initial_state (screen_saver); diff --git a/savers/gs-theme-engine.c b/savers/gs-theme-engine.c index d2a0382ddf71939dcde0dbfbe459505b82446de1..92fd70a7ef96825746fef2e8b3006e989a9dd588 100644 --- a/savers/gs-theme-engine.c +++ b/savers/gs-theme-engine.c @@ -32,8 +32,6 @@ #include "gs-theme-engine.h" #include "gs-theme-engine-marshal.h" -static void gs_theme_engine_class_init (GSThemeEngineClass *klass); -static void gs_theme_engine_init (GSThemeEngine *engine); static void gs_theme_engine_finalize (GObject *object); struct GSThemeEnginePrivate { diff --git a/savers/gste-popsquares.c b/savers/gste-popsquares.c index 1b9c024aaece18a719a35c0721df8ad2b84733ee..9c8ef830dc1a73630a01ec28eb913164f401788a 100644 --- a/savers/gste-popsquares.c +++ b/savers/gste-popsquares.c @@ -33,8 +33,6 @@ #include "gs-theme-engine.h" #include "gste-popsquares.h" -static void gste_popsquares_class_init (GSTEPopsquaresClass *klass); -static void gste_popsquares_init (GSTEPopsquares *engine); static void gste_popsquares_finalize (GObject *object); static void draw_frame (GSTEPopsquares *pop, cairo_t *cr); diff --git a/savers/gste-slideshow.c b/savers/gste-slideshow.c index 040fb2a5c3a90dcc428416f4fa83c9785b361c7b..0b41c253550de96f2c03427766216a88463d760e 100644 --- a/savers/gste-slideshow.c +++ b/savers/gste-slideshow.c @@ -33,8 +33,6 @@ #include "gs-theme-engine.h" #include "gste-slideshow.h" -static void gste_slideshow_class_init (GSTESlideshowClass *klass); -static void gste_slideshow_init (GSTESlideshow *engine); static void gste_slideshow_finalize (GObject *object); struct GSTESlideshowPrivate { diff --git a/src/gs-auth-pam.c b/src/gs-auth-pam.c index d967ef5017b1fb48318da3816db5aa1235f97b93..c45f3e42324197ea84d50667b971b4d43884006f 100644 --- a/src/gs-auth-pam.c +++ b/src/gs-auth-pam.c @@ -456,8 +456,9 @@ set_pam_error (GError **error, } } -static int -gs_auth_thread_func (int auth_operation_fd) { +static gpointer +gs_auth_thread_func (gpointer data) { + int auth_operation_fd = GPOINTER_TO_INT (data); static const int flags = 0; int status; int status2; @@ -542,7 +543,7 @@ done: */ close (auth_operation_fd); - return status; + return GINT_TO_POINTER (status); } static gboolean @@ -595,7 +596,7 @@ gs_auth_pam_verify_user (pam_handle_t *handle, (GIOFunc) gs_auth_loop_quit, &thread_done); auth_thread = g_thread_new ("auththread", - (GThreadFunc) gs_auth_thread_func, + gs_auth_thread_func, GINT_TO_POINTER (auth_operation_fds[1])); if (auth_thread == NULL) { diff --git a/src/gs-grab-x11.c b/src/gs-grab-x11.c index 3892af43f609e401a4a542b75b52aca166028a38..e4c9ca4fd7fa8c1e95026402e25e73deafc03601 100644 --- a/src/gs-grab-x11.c +++ b/src/gs-grab-x11.c @@ -37,8 +37,6 @@ #include "gs-debug.h" #define SLEEPTIMEOUT 100000 -static void gs_grab_class_init (GSGrabClass *klass); -static void gs_grab_init (GSGrab *grab); static void gs_grab_finalize (GObject *object); static gpointer grab_object = NULL; diff --git a/src/gs-job.c b/src/gs-job.c index 7f9f9e28e3355404fa4599d921f9da8733dea794..e6cecbf7f3fe43ebebd4c0fa9f09578a2824ea15 100644 --- a/src/gs-job.c +++ b/src/gs-job.c @@ -46,8 +46,6 @@ #include "gs-theme-manager.h" #include "subprocs.h" -static void gs_job_class_init (GSJobClass *klass); -static void gs_job_init (GSJob *job); static void gs_job_finalize (GObject *object); typedef enum { diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c index bef6b74695043f4c85347974986588c5e63ad944..a1ef830767d51339554ada554b144dc8bbe994ad 100644 --- a/src/gs-listener-dbus.c +++ b/src/gs-listener-dbus.c @@ -47,8 +47,6 @@ #include "gs-debug.h" #include "gs-prefs.h" -static void gs_listener_class_init (GSListenerClass *klass); -static void gs_listener_init (GSListener *listener); static void gs_listener_finalize (GObject *object); static void gs_listener_unregister_handler (DBusConnection *connection, diff --git a/src/gs-listener-x11.c b/src/gs-listener-x11.c index 37714d0feef3e6e7b3f6924ee39bfa074a899ec5..b77d913e8a4494d5b46d9b0a769a2687e8a57b6a 100644 --- a/src/gs-listener-x11.c +++ b/src/gs-listener-x11.c @@ -42,8 +42,6 @@ #include "gs-debug.h" #include "gs-prefs.h" -static void gs_listener_x11_class_init (GSListenerX11Class *klass); -static void gs_listener_x11_init (GSListenerX11 *listener); static void gs_listener_x11_finalize (GObject *object); static void reset_timer (GSListenerX11 *listener, @@ -120,7 +118,7 @@ get_x11_idle_info (guint *idle_time, } static gboolean -check_fullscreen_window () { +check_fullscreen_window (void) { WnckScreen *screen; WnckWindow *window; diff --git a/src/gs-manager.c b/src/gs-manager.c index a83d0f77e12209fbb8f305177024610288634c83..b692192f873aec490efb64d1553d2b93e266628c 100644 --- a/src/gs-manager.c +++ b/src/gs-manager.c @@ -36,8 +36,6 @@ #include "gs-prefs.h" #include "gs-window.h" -static void gs_manager_class_init (GSManagerClass *klass); -static void gs_manager_init (GSManager *manager); static void gs_manager_finalize (GObject *object); static void remove_dpms_timer (GSManager *manager); diff --git a/src/gs-monitor.c b/src/gs-monitor.c index d3b9e4be18f1465a222a65931b93e612b082345c..66549f1364fd5d16cb04b4a68638172f2c6570f6 100644 --- a/src/gs-monitor.c +++ b/src/gs-monitor.c @@ -42,8 +42,6 @@ #include "gs-prefs.h" #include "xfce4-screensaver.h" -static void gs_monitor_class_init(GSMonitorClass* klass); -static void gs_monitor_init(GSMonitor* monitor); static void gs_monitor_finalize(GObject* object); struct GSMonitorPrivate { diff --git a/src/gs-prefs.c b/src/gs-prefs.c index acd9dff5a3f42355ad2e90cc47bc910aa72c13ca..32df3aa6e4fb50e1bf2394f268ff8f53ce6d57ee 100644 --- a/src/gs-prefs.c +++ b/src/gs-prefs.c @@ -33,11 +33,9 @@ #include "gs-prefs.h" -static void gs_prefs_class_init (GSPrefsClass *klass); -static void gs_prefs_init (GSPrefs *prefs); static void gs_prefs_finalize (GObject *object); -static GSPrefs *prefs; +static GSPrefs *global_prefs; struct GSPrefsPrivate { XfconfChannel *channel; @@ -200,8 +198,7 @@ _gs_prefs_set_themes (GSPrefs *prefs, gchar **values) { guint i; if (prefs->themes) { - g_slist_foreach (prefs->themes, (GFunc)g_free, NULL); - g_slist_free (prefs->themes); + g_slist_free_full (prefs->themes, g_free); prefs->themes = NULL; } @@ -632,8 +629,7 @@ gs_prefs_finalize (GObject *object) { } if (prefs->themes) { - g_slist_foreach (prefs->themes, (GFunc)g_free, NULL); - g_slist_free (prefs->themes); + g_slist_free_full (prefs->themes, g_free); } g_free (prefs->logout_command); @@ -645,11 +641,11 @@ gs_prefs_finalize (GObject *object) { GSPrefs * gs_prefs_new (void) { GObject *object; - if (!prefs) { + if (!global_prefs) { object = g_object_new (GS_TYPE_PREFS, NULL); - prefs = GS_PREFS (object); + global_prefs = GS_PREFS (object); } else - object = g_object_ref (G_OBJECT (prefs)); + object = g_object_ref (G_OBJECT (global_prefs)); return GS_PREFS (object); } diff --git a/src/gs-theme-manager.c b/src/gs-theme-manager.c index 8be023266028d59e29cf24c32fe3c4ab75894fb5..bb1c09d516034784b848a540dbef4acff0b0f5bb 100644 --- a/src/gs-theme-manager.c +++ b/src/gs-theme-manager.c @@ -38,8 +38,6 @@ #include "gs-theme-manager.h" #include "gs-debug.h" -static void gs_theme_manager_class_init (GSThemeManagerClass *klass); -static void gs_theme_manager_init (GSThemeManager *theme_manager); static void gs_theme_manager_finalize (GObject *object); struct _GSThemeInfo { diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c index 4963087816e546c495a9db95ac036276d9681b86..7ab50c8cea3a40a5ba25e81e9c0f04745df13223 100644 --- a/src/gs-window-x11.c +++ b/src/gs-window-x11.c @@ -43,8 +43,6 @@ #include "gs-window.h" #include "subprocs.h" -static void gs_window_class_init (GSWindowClass *klass); -static void gs_window_init (GSWindow *window); static void gs_window_finalize (GObject *object); static gboolean popup_dialog_idle (gpointer user_data); @@ -323,7 +321,7 @@ gs_window_move_resize_window (GSWindow *window, GdkWindow *gdkwindow; widget = GTK_WIDGET (window); - gdkwindow = gtk_widget_get_window (GTK_WIDGET (window)); + gdkwindow = gtk_widget_get_window (widget); g_assert (gtk_widget_get_realized (widget)); diff --git a/src/xfce-bg.c b/src/xfce-bg.c index 0d270b084e0fce4dc5b36333e00db682f440ff30..6a9f3246d331244c46d223a193ef40f4033e4c33 100644 --- a/src/xfce-bg.c +++ b/src/xfce-bg.c @@ -620,7 +620,7 @@ xfce_bg_set_placement (XfceBG *bg, } static inline gchar * -get_wallpaper_cache_dir () { +get_wallpaper_cache_dir (void) { return g_build_filename (g_get_user_cache_dir(), XFCE_BG_CACHE_DIR, NULL); } @@ -1877,13 +1877,14 @@ handle_text (GMarkupParseContext *context, gpointer user_data, GError **err) { SlideShow *parser = user_data; + Slide *slide; FileSize *fs; gint i; g_return_if_fail (parser != NULL); g_return_if_fail (parser->slides != NULL); - Slide *slide = parser->slides->tail ? parser->slides->tail->data : NULL; + slide = parser->slides->tail ? parser->slides->tail->data : NULL; if (stack_is (parser, "year", "starttime", "background", NULL)) { parser->start_tm.tm_year = parse_int (text) - 1900; @@ -1991,10 +1992,7 @@ slideshow_unref (SlideShow *show) { } g_queue_free (show->slides); - - g_list_foreach (show->stack->head, (GFunc) g_free, NULL); - g_queue_free (show->stack); - + g_queue_free_full (show->stack, g_free); g_free (show); } diff --git a/src/xfce4-screensaver-dialog.c b/src/xfce4-screensaver-dialog.c index 7721df68522b644bfdfed3bcf286038ceb238260..e6dae48c428fdac652c53df6ea029b21e2661e28 100644 --- a/src/xfce4-screensaver-dialog.c +++ b/src/xfce4-screensaver-dialog.c @@ -438,7 +438,7 @@ static gboolean popup_dialog_idle(gpointer user_data) { */ static gboolean privileged_initialization(int *argc, char **argv, - gboolean verbose) { + gboolean local_verbose) { gboolean ret; char *nolock_reason; char *orig_uid; @@ -457,7 +457,7 @@ static gboolean privileged_initialization(int *argc, g_debug("Locking disabled: %s", nolock_reason); } - if (uid_message && verbose) { + if (uid_message && local_verbose) { g_print("Modified UID: %s", uid_message); } @@ -480,7 +480,7 @@ static gboolean privileged_initialization(int *argc, static gboolean lock_initialization (int *argc, char **argv, char **nolock_reason, - gboolean verbose) { + gboolean local_verbose) { if (nolock_reason != NULL) { *nolock_reason = NULL; } diff --git a/src/xfce4-screensaver-preferences.c b/src/xfce4-screensaver-preferences.c index 20cb1d2d4c114629cfd46f4e54cf725e38cbaf97..6b1e4ef7e95f703989ae1953a39995a67976a04e 100644 --- a/src/xfce4-screensaver-preferences.c +++ b/src/xfce4-screensaver-preferences.c @@ -241,13 +241,13 @@ config_get_theme (gboolean *is_writable) { } static gchar ** -get_all_theme_ids (GSThemeManager *theme_manager) { +get_all_theme_ids (GSThemeManager *local_theme_manager) { gchar **ids = NULL; GSList *themes; GSList *l; guint idx = 0; - themes = gs_theme_manager_get_info_list (theme_manager); + themes = gs_theme_manager_get_info_list (local_theme_manager); ids = g_new0 (gchar *, g_slist_length (themes) + 1); for (l = themes; l; l = l->next) { GSThemeInfo *info = l->data; @@ -569,7 +569,7 @@ config_get_theme_arguments (const gchar *theme) { } static void -job_set_theme (GSJob *job, +job_set_theme (GSJob *local_job, const char *theme) { GSThemeInfo *info; gchar *command = NULL; @@ -583,7 +583,7 @@ job_set_theme (GSJob *job, command = g_strdup_printf ("%s %s", gs_theme_info_get_exec (info), arguments); } - gs_job_set_command (job, command); + gs_job_set_command (local_job, command); if (arguments) g_free (arguments); @@ -1700,9 +1700,6 @@ setup_for_lid_switch (void) { } } -/* copied from gs-window-x11.c */ -extern char **environ; - static gchar ** spawn_make_environment_for_display (GdkDisplay *display, gchar **envp) { @@ -1713,6 +1710,7 @@ spawn_make_environment_for_display (GdkDisplay *display, g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); + /* environ is declared in gs-window-x11.c */ if (envp == NULL) envp = environ; diff --git a/src/xfcekbd-indicator.c b/src/xfcekbd-indicator.c index 482c5ff652950d0569fb9d1c038d9c2202ed85c4..08dcba4b4f2b490aa0264219c3a0ccbf162d3435 100644 --- a/src/xfcekbd-indicator.c +++ b/src/xfcekbd-indicator.c @@ -143,8 +143,9 @@ xfcekbd_indicator_button_pressed (GtkWidget *widget, GdkEventButton *event, XfcekbdIndicator *gki) { if (event->button == 1 && event->type == GDK_BUTTON_PRESS) { + int group; gs_debug("Switching language"); - int group = xkl_engine_get_next_group (globals.engine); + group = xkl_engine_get_next_group (globals.engine); xkl_engine_lock_group (globals.engine, group); globals.redraw_queued = TRUE; return TRUE; @@ -310,18 +311,20 @@ xfcekbd_indicator_set_current_page_for_group (XfcekbdIndicator *gki, /* Should be called once for all widgets */ static GdkFilterReturn xfcekbd_indicator_filter_x_evt (GdkXEvent *xev, - GdkEvent *event) { + GdkEvent *event, + gpointer data) { XEvent *xevent = (XEvent *) xev; xkl_engine_filter_events (globals.engine, xevent); switch (xevent->type) { case ReparentNotify: { + XReparentEvent *rne; if (!globals.redraw_queued) return GDK_FILTER_CONTINUE; gs_debug("do repaint\n"); - XReparentEvent *rne = (XReparentEvent *) xev; + rne = (XReparentEvent *) xev; ForAllIndicators () { GdkWindow *w =