[Xfce4-commits] [apps/xfce4-screensaver] 01/01: cpplint fixes
noreply at xfce.org
noreply at xfce.org
Thu Jun 6 04:33:11 CEST 2019
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/xfce4-screensaver.
commit ee027bb96b45e8cfb09ce126ae715265a51ac17e
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Wed Jun 5 22:33:04 2019 -0400
cpplint fixes
---
savers/gs-theme-window.c | 16 ++++++-------
savers/gste-popsquares.c | 17 +++++---------
savers/gste-slideshow.c | 23 +++++++++---------
savers/gste-slideshow.h | 2 +-
savers/xdg-user-dir-lookup.c | 16 -------------
src/gs-auth-bsdauth.c | 6 ++---
src/gs-auth-helper.c | 4 ++--
src/gs-auth-pam.c | 23 +++++++-----------
src/gs-auth-pwent.c | 4 ++--
src/gs-debug.c | 2 +-
src/gs-fade.c | 32 ++++---------------------
src/gs-fade.h | 6 -----
src/gs-grab-x11.c | 43 +++++++++------------------------
src/gs-grab.h | 3 ---
src/gs-listener-dbus.c | 25 ++------------------
src/gs-listener-dbus.h | 2 --
src/gs-listener-x11.c | 15 ++++++------
src/gs-lock-plug.c | 15 ++++++------
src/gs-manager.c | 47 ++++---------------------------------
src/gs-manager.h | 7 +-----
src/gs-theme-manager.c | 28 +++++++---------------
src/gs-theme-manager.h | 1 -
src/gs-window-x11.c | 42 ++++++++++-----------------------
src/gs-window.h | 2 --
src/subprocs.c | 35 ---------------------------
src/subprocs.h | 2 --
src/test-fade.c | 5 ----
src/xfce-bg.c | 47 ++++++++++++++++++-------------------
src/xfce-rr.c | 8 +++----
src/xfce4-screensaver-gl-helper.c | 2 +-
src/xfce4-screensaver-preferences.c | 15 ++++++------
src/xfcekbd-indicator-config.h | 12 +++++-----
src/xfcekbd-indicator.c | 1 -
src/xfcekbd-indicator.h | 2 +-
src/xfcekbd-keyboard-config.c | 36 +++++++++++-----------------
src/xfcekbd-keyboard-config.h | 2 +-
36 files changed, 157 insertions(+), 391 deletions(-)
diff --git a/savers/gs-theme-window.c b/savers/gs-theme-window.c
index 3a4c98f..74c7b52 100644
--- a/savers/gs-theme-window.c
+++ b/savers/gs-theme-window.c
@@ -67,14 +67,14 @@ gs_theme_window_init (GSThemeWindow *window) {
static void
gs_theme_window_finalize (GObject *object) {
- GObjectClass *parent_class;
+ GObjectClass *p_class;
GS_THEME_WINDOW (object);
- parent_class = G_OBJECT_CLASS (gs_theme_window_parent_class);
+ p_class = G_OBJECT_CLASS (gs_theme_window_parent_class);
- if (parent_class->finalize != NULL)
- parent_class->finalize (object);
+ if (p_class->finalize != NULL)
+ p_class->finalize (object);
}
static void
@@ -124,12 +124,12 @@ gs_theme_window_real_realize (GtkWidget *widget) {
}
if (window == NULL) {
- GtkWidgetClass *parent_class;
+ GtkWidgetClass *p_class;
- parent_class = GTK_WIDGET_CLASS (gs_theme_window_parent_class);
+ p_class = GTK_WIDGET_CLASS (gs_theme_window_parent_class);
- if (parent_class->realize != NULL)
- parent_class->realize (widget);
+ if (p_class->realize != NULL)
+ p_class->realize (widget);
return;
}
diff --git a/savers/gste-popsquares.c b/savers/gste-popsquares.c
index 3d5079f..c7e2874 100644
--- a/savers/gste-popsquares.c
+++ b/savers/gste-popsquares.c
@@ -193,14 +193,9 @@ make_color_ramp (int h1,
gboolean closed) {
double dh, ds, dv; /* deltas */
int i;
- int ncolors, wanted;
+ int ncolors;
int total_ncolors = n_colors;
- wanted = total_ncolors;
- if (closed) {
- wanted = (wanted / 2) + 1;
- }
-
ncolors = total_ncolors;
memset (colors, 0, n_colors * sizeof (*colors));
@@ -502,16 +497,16 @@ draw_iter (GSTEPopsquares *pop) {
}
static void
-gste_popsquares_init (GSTEPopsquares *pop) {
+gste_popsquares_init (GSTEPopsquares *engine) {
int delay;
- pop->priv = gste_popsquares_get_instance_private (pop);
+ engine->priv = gste_popsquares_get_instance_private (engine);
- pop->priv->ncolors = 128;
- pop->priv->subdivision = 5;
+ engine->priv->ncolors = 128;
+ engine->priv->subdivision = 5;
delay = 25;
- pop->priv->timeout_id = g_timeout_add (delay, (GSourceFunc)draw_iter, pop);
+ engine->priv->timeout_id = g_timeout_add (delay, (GSourceFunc)draw_iter, engine);
}
static void
diff --git a/savers/gste-slideshow.c b/savers/gste-slideshow.c
index 9ff61cf..33b169c 100644
--- a/savers/gste-slideshow.c
+++ b/savers/gste-slideshow.c
@@ -57,7 +57,6 @@ struct GSTESlideshowPrivate {
gint64 fade_ticks;
- GThread *load_thread;
GAsyncQueue *op_q;
GAsyncQueue *results_q;
@@ -299,10 +298,10 @@ update_display (GSTESlideshow *show) {
static gboolean
draw_iter (GSTESlideshow *show) {
- double old_opacity;
- double new_opacity;
-
if (show->priv->pat2 != NULL) {
+ double old_opacity;
+ double new_opacity;
+
gdouble fps;
gdouble elapsed;
@@ -504,7 +503,6 @@ get_pixbuf_from_local_dir (GSTESlideshow *show,
const char *location) {
GdkPixbuf *pixbuf, *transformed_pixbuf;
char *filename;
- int i;
GSList *l;
/* rebuild the cache */
@@ -522,6 +520,7 @@ get_pixbuf_from_local_dir (GSTESlideshow *show,
/* get a random filename if needed */
if (!show->priv->sort_images) {
+ int i;
i = g_random_int_range (0, g_slist_length (show->priv->filename_list));
l = g_slist_nth (show->priv->filename_list, i);
} else {
@@ -879,17 +878,17 @@ set_visual (GtkWidget *widget) {
}
static void
-gste_slideshow_init (GSTESlideshow *show) {
- show->priv = gste_slideshow_get_instance_private (show);
+gste_slideshow_init (GSTESlideshow *engine) {
+ engine->priv = gste_slideshow_get_instance_private (engine);
- show->priv->images_location = g_strdup (DEFAULT_IMAGES_LOCATION);
+ engine->priv->images_location = g_strdup (DEFAULT_IMAGES_LOCATION);
- show->priv->op_q = g_async_queue_new ();
- show->priv->results_q = g_async_queue_new ();
+ engine->priv->op_q = g_async_queue_new ();
+ engine->priv->results_q = g_async_queue_new ();
- g_thread_new ("loadthread", (GThreadFunc)load_threadfunc, show->priv->op_q);
+ g_thread_new ("loadthread", (GThreadFunc)load_threadfunc, engine->priv->op_q);
- set_visual (GTK_WIDGET (show));
+ set_visual (GTK_WIDGET (engine));
}
static void
diff --git a/savers/gste-slideshow.h b/savers/gste-slideshow.h
index 5db0cd0..e8c486e 100644
--- a/savers/gste-slideshow.h
+++ b/savers/gste-slideshow.h
@@ -57,7 +57,7 @@ void gste_slideshow_set_images_location (GSTESlideshow *show,
const char *location);
void gste_slideshow_set_sort_images (GSTESlideshow *show,
- gboolean sort_image);
+ gboolean sort_images);
void gste_slideshow_set_background_color (GSTESlideshow *show,
const char *background_color);
diff --git a/savers/xdg-user-dir-lookup.c b/savers/xdg-user-dir-lookup.c
index 1caee73..8fcbb77 100644
--- a/savers/xdg-user-dir-lookup.c
+++ b/savers/xdg-user-dir-lookup.c
@@ -141,19 +141,3 @@ error:
return strdup (home_dir);
}
}
-
-#ifdef STANDALONE
-
-int
-main (int argc, char *argv[])
-{
- if (argc != 2) {
- fprintf (stderr, "Usage %s <dir-type>\n", argv[0]);
- exit (1);
- }
-
- printf ("%s\n", xdg_user_dir_lookup (argv[1]));
- return 0;
-}
-
-#endif
diff --git a/src/gs-auth-bsdauth.c b/src/gs-auth-bsdauth.c
index 720c499..81a0f66 100644
--- a/src/gs-auth-bsdauth.c
+++ b/src/gs-auth-bsdauth.c
@@ -51,8 +51,8 @@ gs_auth_error_quark (void) {
}
void
-gs_auth_set_verbose (gboolean enabled) {
- verbose_enabled = enabled;
+gs_auth_set_verbose (gboolean verbose) {
+ verbose_enabled = verbose;
}
gboolean
@@ -67,7 +67,7 @@ gs_auth_verify_user (const char *username,
gpointer data,
GError **error) {
int res;
- char *password;
+ char *password = NULL;
/* ask for the password for user */
if (func != NULL) {
diff --git a/src/gs-auth-helper.c b/src/gs-auth-helper.c
index 6784b91..22eec84 100644
--- a/src/gs-auth-helper.c
+++ b/src/gs-auth-helper.c
@@ -63,8 +63,8 @@ gs_auth_error_quark (void) {
}
void
-gs_auth_set_verbose (gboolean enabled) {
- verbose_enabled = enabled;
+gs_auth_set_verbose (gboolean verbose) {
+ verbose_enabled = verbose;
}
gboolean
diff --git a/src/gs-auth-pam.c b/src/gs-auth-pam.c
index 2cb78d8..5600c06 100644
--- a/src/gs-auth-pam.c
+++ b/src/gs-auth-pam.c
@@ -112,8 +112,8 @@ gs_auth_error_quark (void) {
}
void
-gs_auth_set_verbose (gboolean enabled) {
- verbose_enabled = enabled;
+gs_auth_set_verbose (gboolean verbose) {
+ verbose_enabled = verbose;
}
gboolean
@@ -356,10 +356,10 @@ create_pam_handle (const char *username,
const char *display,
struct pam_conv *conv,
int *status_code) {
- int status;
+ int status = -1;
const char *service = PAM_SERVICE_NAME;
- char *disp;
- gboolean ret;
+ char *disp = NULL;
+ gboolean ret = TRUE;
if (pam_handle != NULL) {
g_warning ("create_pam_handle: Stale pam handle around, cleaning up");
@@ -368,9 +368,6 @@ create_pam_handle (const char *username,
/* init things */
pam_handle = NULL;
- status = -1;
- disp = NULL;
- ret = TRUE;
/* Initialize a PAM session for the user */
if ((status = pam_start (service, username, conv, &pam_handle)) != PAM_SUCCESS) {
@@ -560,16 +557,12 @@ static gboolean
gs_auth_pam_verify_user (pam_handle_t *handle,
int *status) {
GThread *auth_thread;
- GIOChannel *channel;
- guint watch_id;
+ GIOChannel *channel = NULL;
+ guint watch_id = 0;
int auth_operation_fds[2];
- int auth_status;
+ int auth_status = PAM_AUTH_ERR;
gboolean thread_done;
- channel = NULL;
- watch_id = 0;
- auth_status = PAM_AUTH_ERR;
-
/* This pipe gives us a set of fds we can hook into
* the event loop to be notified when our helper thread
* is ready to be reaped.
diff --git a/src/gs-auth-pwent.c b/src/gs-auth-pwent.c
index 2e04da1..ae1d44c 100644
--- a/src/gs-auth-pwent.c
+++ b/src/gs-auth-pwent.c
@@ -104,8 +104,8 @@ gs_auth_error_quark (void) {
}
void
-gs_auth_set_verbose (gboolean enabled) {
- verbose_enabled = enabled;
+gs_auth_set_verbose (gboolean verbose) {
+ verbose_enabled = verbose;
}
gboolean
diff --git a/src/gs-debug.c b/src/gs-debug.c
index 3e28280..550f7af 100644
--- a/src/gs-debug.c
+++ b/src/gs-debug.c
@@ -135,13 +135,13 @@ _gs_profile_log (const char *func,
const char *note,
const char *format,
...) {
- va_list args;
char *str;
char *formatted;
if (format == NULL) {
formatted = g_strdup ("");
} else {
+ va_list args;
va_start (args, format);
formatted = g_strdup_vprintf (format, args);
va_end (args);
diff --git a/src/gs-fade.c b/src/gs-fade.c
index d1c33ee..92d24af 100644
--- a/src/gs-fade.c
+++ b/src/gs-fade.c
@@ -236,23 +236,6 @@ xf86_whack_gamma (int screen,
# define XF86_VIDMODE_GAMMA_RAMP_MIN_MINOR 1
-gboolean
-gs_fade_get_enabled (GSFade *fade) {
- g_return_val_if_fail (GS_IS_FADE (fade), FALSE);
-
- return fade->priv->enabled;
-}
-
-void
-gs_fade_set_enabled (GSFade *fade,
- gboolean enabled) {
- g_return_if_fail (GS_IS_FADE (fade));
-
- if (fade->priv->enabled != enabled) {
- fade->priv->enabled = enabled;
- }
-}
-
#ifdef HAVE_XF86VMODE_GAMMA
static gboolean
gamma_fade_setup (GSFade *fade) {
@@ -514,7 +497,6 @@ static void xrandr_crtc_whack_gamma (XfceRRCrtc *crtc,
static gboolean xrandr_fade_set_alpha_gamma (GSFade *fade,
gdouble alpha) {
struct GSFadeScreenPrivate *screen_priv;
- struct GSGammaInfo *info;
XfceRRCrtc **crtcs;
int i;
@@ -527,6 +509,7 @@ static gboolean xrandr_fade_set_alpha_gamma (GSFade *fade,
i = 0;
while (*crtcs) {
+ struct GSGammaInfo *info;
info = &screen_priv->info[i];
xrandr_crtc_whack_gamma (*crtcs, info, alpha);
i++;
@@ -637,13 +620,6 @@ fade_out_timer (GSFade *fade) {
return TRUE;
}
-gboolean
-gs_fade_get_active (GSFade *fade) {
- g_return_val_if_fail (GS_IS_FADE (fade), FALSE);
-
- return fade->priv->active;
-}
-
static void
gs_fade_set_timeout (GSFade *fade,
guint timeout) {
@@ -714,7 +690,7 @@ gs_fade_async_callback (GSFade *fade,
void
gs_fade_async (GSFade *fade,
guint timeout,
- GSFadeDoneFunc func,
+ GSFadeDoneFunc done_cb,
gpointer data) {
g_return_if_fail (GS_IS_FADE (fade));
@@ -723,11 +699,11 @@ gs_fade_async (GSFade *fade,
gs_fade_stop (fade);
}
- if (func) {
+ if (done_cb) {
FadedCallbackData *cb_data;
cb_data = g_new0 (FadedCallbackData, 1);
- cb_data->done_cb = func;
+ cb_data->done_cb = done_cb;
cb_data->data = data;
g_signal_connect (fade, "faded",
diff --git a/src/gs-fade.h b/src/gs-fade.h
index 73b7c7a..7a85a1b 100644
--- a/src/gs-fade.h
+++ b/src/gs-fade.h
@@ -68,12 +68,6 @@ void gs_fade_sync (GSFade *fade,
void gs_fade_finish (GSFade *fade);
void gs_fade_reset (GSFade *fade);
-gboolean gs_fade_get_active (GSFade *fade);
-
-gboolean gs_fade_get_enabled (GSFade *fade);
-void gs_fade_set_enabled (GSFade *fade,
- gboolean enabled);
-
G_END_DECLS
#endif /* SRC_GS_FADE_H_ */
diff --git a/src/gs-grab-x11.c b/src/gs-grab-x11.c
index 8b70932..e7b87a4 100644
--- a/src/gs-grab-x11.c
+++ b/src/gs-grab-x11.c
@@ -126,17 +126,17 @@ xorg_lock_smasher_set_active (GSGrab *grab,
status = MiscExtGrabStateSuccess;
}
- if (error == Success) {
- gs_debug ("XF86MiscSetGrabKeysState(%s) returned %s\n",
- active ? "on" : "off",
- (status == MiscExtGrabStateSuccess ? "MiscExtGrabStateSuccess" :
- status == MiscExtGrabStateLocked ? "MiscExtGrabStateLocked" :
- status == MiscExtGrabStateAlready ? "MiscExtGrabStateAlready" :
- "unknown value"));
- } else {
- gs_debug ("XF86MiscSetGrabKeysState(%s) failed with error code %d\n",
- active ? "on" : "off", error);
- }
+ if (error == Success) {
+ gs_debug ("XF86MiscSetGrabKeysState(%s) returned %s\n",
+ active ? "on" : "off",
+ (status == MiscExtGrabStateSuccess ? "MiscExtGrabStateSuccess" :
+ status == MiscExtGrabStateLocked ? "MiscExtGrabStateLocked" :
+ status == MiscExtGrabStateAlready ? "MiscExtGrabStateAlready" :
+ "unknown value"));
+ } else {
+ gs_debug ("XF86MiscSetGrabKeysState(%s) failed with error code %d\n",
+ active ? "on" : "off", error);
+ }
}
#else
static void
@@ -426,27 +426,6 @@ gs_grab_grab_root (GSGrab *grab,
return res;
}
-/* this is used to grab devices to an offscreen window */
-gboolean
-gs_grab_grab_offscreen (GSGrab *grab,
- gboolean no_pointer_grab,
- gboolean hide_cursor) {
- GdkWindow *window;
- GdkDisplay *display;
- GdkScreen *screen;
- gboolean res;
-
- gs_debug ("Grabbing an offscreen window");
-
- window = gtk_widget_get_window (GTK_WIDGET (grab->priv->invisible));
- screen = gtk_invisible_get_screen (GTK_INVISIBLE (grab->priv->invisible));
- display = gdk_screen_get_display (screen);
- res = gs_grab_grab_window (grab, window, display,
- no_pointer_grab, hide_cursor);
-
- return res;
-}
-
/* this is similar to gs_grab_grab_window but doesn't fail */
void
gs_grab_move_to_window (GSGrab *grab,
diff --git a/src/gs-grab.h b/src/gs-grab.h
index 14c4ac3..aaa26e3 100644
--- a/src/gs-grab.h
+++ b/src/gs-grab.h
@@ -64,9 +64,6 @@ gboolean gs_grab_grab_window (GSGrab *grab,
gboolean gs_grab_grab_root (GSGrab *grab,
gboolean no_pointer_grab,
gboolean hide_cursor);
-gboolean gs_grab_grab_offscreen (GSGrab *grab,
- gboolean no_pointer_grab,
- gboolean hide_cursor);
void gs_grab_move_to_window (GSGrab *grab,
GdkWindow *window,
diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
index 66d56df..3ca6390 100644
--- a/src/gs-listener-dbus.c
+++ b/src/gs-listener-dbus.c
@@ -164,7 +164,6 @@ gs_listener_ref_entry_free (GSListenerRefEntry *entry) {
g_free (entry->application);
g_free (entry->reason);
g_free (entry);
- entry = NULL;
}
static void
@@ -467,24 +466,6 @@ gs_listener_set_session_idle (GSListener *listener,
return res;
}
-gboolean
-gs_listener_get_activation_enabled (GSListener *listener) {
- g_return_val_if_fail (GS_IS_LISTENER (listener), FALSE);
-
- return listener->priv->activation_enabled;
-}
-
-gboolean
-gs_listener_is_inhibited (GSListener *listener) {
- gboolean inhibited;
-
- g_return_val_if_fail (GS_IS_LISTENER (listener), FALSE);
-
- inhibited = listener_ref_entry_is_present (listener, REF_ENTRY_TYPE_INHIBIT);
-
- return inhibited;
-}
-
void
gs_listener_set_activation_enabled (GSListener *listener,
gboolean enabled) {
@@ -603,7 +584,7 @@ listener_ref_entry_check (GSListener *listener,
static void
add_session_inhibit (GSListener *listener,
GSListenerRefEntry *entry) {
- DBusMessage *message, *reply;
+ DBusMessage *message = NULL, *reply = NULL;
DBusMessageIter iter, reply_iter;
DBusError error;
const gchar *mode = "block";
@@ -703,11 +684,9 @@ listener_remove_ref_entry (GSListener *listener,
int entry_type,
guint32 cookie) {
GHashTable *hash;
- gboolean removed;
+ gboolean removed = FALSE;
GSListenerRefEntry *entry;
- removed = FALSE;
-
hash = get_hash_for_entry_type (listener, entry_type);
entry = g_hash_table_lookup (hash, &cookie);
diff --git a/src/gs-listener-dbus.h b/src/gs-listener-dbus.h
index 668004d..18af08d 100644
--- a/src/gs-listener-dbus.h
+++ b/src/gs-listener-dbus.h
@@ -84,8 +84,6 @@ void gs_listener_set_activation_enabled (GSListener *listener,
gboolean enabled);
void gs_listener_set_sleep_activation_enabled (GSListener *listener,
gboolean enabled);
-gboolean gs_listener_get_activation_enabled (GSListener *listener);
-gboolean gs_listener_is_inhibited (GSListener *listener);
G_END_DECLS
diff --git a/src/gs-listener-x11.c b/src/gs-listener-x11.c
index 14ebe08..0cb7faa 100644
--- a/src/gs-listener-x11.c
+++ b/src/gs-listener-x11.c
@@ -222,7 +222,6 @@ gs_listener_x11_acquire (GSListenerX11 *listener) {
GdkScreen *screen;
GdkWindow *window;
int scrnsaver_error_base;
- unsigned long events;
g_return_val_if_fail (listener != NULL, FALSE);
@@ -234,6 +233,7 @@ gs_listener_x11_acquire (GSListenerX11 *listener) {
if (XScreenSaverQueryExtension (GDK_DISPLAY_XDISPLAY (display),
&listener->priv->scrnsaver_event_base,
&scrnsaver_error_base)) {
+ unsigned long events;
events = ScreenSaverNotifyMask;
XScreenSaverSelectInput (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window), events);
gs_debug ("ScreenSaver Registered");
@@ -250,18 +250,17 @@ gs_listener_x11_acquire (GSListenerX11 *listener) {
void
gs_listener_x11_set_timeout (GSListenerX11 *listener,
- gint lock_after) {
+ gint timeout) {
Display *display = gdk_x11_display_get_xdisplay(gdk_display_get_default());
- gint timeout = lock_after * 60;
+ gint lock_timeout = timeout * 60;
/* set X server timeouts and disable screen blanking */
- XSetScreenSaver(display, timeout, timeout, 0, 0);
+ XSetScreenSaver(display, lock_timeout, lock_timeout, 0, 0);
- if (listener->priv->lock_timeout != timeout) {
- listener->priv->lock_timeout = timeout;
- listener->priv->lock_timeout = lock_after * 60;
+ if (listener->priv->lock_timeout != lock_timeout) {
+ listener->priv->lock_timeout = timeout * 60;
reset_lock_timer(listener, listener->priv->lock_timeout);
- gs_debug("Lock timeout updated to %i minutes", lock_after);
+ gs_debug("Lock timeout updated to %i minutes", timeout);
}
}
diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index b810ce3..92da99e 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -493,7 +493,7 @@ gs_lock_plug_run (GSLockPlug *plug) {
gulong response_handler;
gulong unmap_handler;
gulong destroy_handler;
- gulong delete_handler;
+ gulong deletion_handler;
gulong keymap_handler;
GdkKeymap *keymap;
@@ -530,7 +530,7 @@ gs_lock_plug_run (GSLockPlug *plug) {
G_CALLBACK (run_unmap_handler),
&ri);
- delete_handler =
+ deletion_handler =
g_signal_connect (plug,
"delete_event",
G_CALLBACK (run_delete_handler),
@@ -557,7 +557,7 @@ gs_lock_plug_run (GSLockPlug *plug) {
g_signal_handler_disconnect (plug, response_handler);
g_signal_handler_disconnect (plug, unmap_handler);
- g_signal_handler_disconnect (plug, delete_handler);
+ g_signal_handler_disconnect (plug, deletion_handler);
g_signal_handler_disconnect (plug, destroy_handler);
g_signal_handler_disconnect (keymap, keymap_handler);
}
@@ -640,13 +640,12 @@ get_user_icon_from_accounts_service (void) {
static gboolean
set_face_image (GSLockPlug *plug) {
- GdkPixbuf *pixbuf = NULL;
- const char *homedir;
- char *path;
- GError *error = NULL;
+ GdkPixbuf *pixbuf = get_user_icon_from_accounts_service ();
- pixbuf = get_user_icon_from_accounts_service ();
if (pixbuf == NULL) {
+ const char *homedir;
+ char *path;
+ GError *error = NULL;
homedir = g_get_home_dir ();
path = g_build_filename (homedir, ".face", NULL);
diff --git a/src/gs-manager.c b/src/gs-manager.c
index d978259..3dbc647 100644
--- a/src/gs-manager.c
+++ b/src/gs-manager.c
@@ -448,20 +448,6 @@ gs_manager_set_saver_active (GSManager *manager,
}
void
-gs_manager_get_saver_enabled (GSManager *manager,
- gboolean *saver_enabled) {
- if (saver_enabled != NULL) {
- *saver_enabled = FALSE;
- }
-
- g_return_if_fail (GS_IS_MANAGER (manager));
-
- if (saver_enabled != NULL) {
- *saver_enabled = manager->priv->saver_enabled;
- }
-}
-
-void
gs_manager_set_saver_enabled (GSManager *manager,
gboolean saver_enabled) {
g_return_if_fail (GS_IS_MANAGER (manager));
@@ -472,20 +458,6 @@ gs_manager_set_saver_enabled (GSManager *manager,
}
void
-gs_manager_get_lock_enabled (GSManager *manager,
- gboolean *lock_enabled) {
- if (lock_enabled != NULL) {
- *lock_enabled = FALSE;
- }
-
- g_return_if_fail (GS_IS_MANAGER (manager));
-
- if (lock_enabled != NULL) {
- *lock_enabled = manager->priv->lock_enabled;
- }
-}
-
-void
gs_manager_set_lock_enabled (GSManager *manager,
gboolean lock_enabled) {
g_return_if_fail (GS_IS_MANAGER (manager));
@@ -686,14 +658,14 @@ gs_manager_set_status_message_enabled (GSManager *manager,
void
gs_manager_set_status_message (GSManager *manager,
- const char *status_message) {
+ const char *message) {
GSList *l;
g_return_if_fail (GS_IS_MANAGER (manager));
g_free (manager->priv->status_message);
- manager->priv->status_message = g_strdup (status_message);
+ manager->priv->status_message = g_strdup (message);
for (l = manager->priv->windows; l; l = l->next) {
gs_window_set_status_message (l->data, manager->priv->status_message);
@@ -1507,13 +1479,12 @@ static int
gs_manager_get_n_monitors (GdkDisplay *display) {
// Since gdk_display_get_n_monitors return wrong monitor count
// this is a workaround for the problem
- GdkMonitor *monitor;
- int n_monitors;
- int i, count = 0;
+ int n_monitors;
+ int i, count = 0;
n_monitors = gdk_display_get_n_monitors (display);
for (i = 0; i < n_monitors; i++) {
- monitor = gdk_display_get_monitor(display, i);
+ GdkMonitor *monitor = gdk_display_get_monitor(display, i);
if (gs_manager_is_real_monitor (monitor))
count++;
}
@@ -1916,11 +1887,3 @@ gs_manager_request_unlock (GSManager *manager) {
return TRUE;
}
-
-void
-gs_manager_cancel_unlock_request (GSManager *manager) {
- GSList *l;
- for (l = manager->priv->windows; l; l = l->next) {
- gs_window_cancel_unlock_request (l->data);
- }
-}
diff --git a/src/gs-manager.h b/src/gs-manager.h
index f27db31..0dae341 100644
--- a/src/gs-manager.h
+++ b/src/gs-manager.h
@@ -78,12 +78,8 @@ void gs_manager_set_status_message_enabled(GSManager *manager,
gboolean status_message_enabled);
void gs_manager_set_status_message (GSManager *manager,
const char *message);
-void gs_manager_get_saver_enabled (GSManager *manager,
- gboolean *saver_enabled);
void gs_manager_set_saver_enabled (GSManager *manager,
gboolean saver_enabled);
-void gs_manager_get_lock_enabled (GSManager *manager,
- gboolean *lock_enabled);
void gs_manager_set_lock_enabled (GSManager *manager,
gboolean lock_enabled);
void gs_manager_get_lock_with_saver_enabled (GSManager *manager,
@@ -101,7 +97,7 @@ void gs_manager_set_logout_timeout (GSManager *manager,
void gs_manager_set_logout_command (GSManager *manager,
const char *command);
void gs_manager_set_throttled (GSManager *manager,
- gboolean lock_with_saver_enabled);
+ gboolean throttled);
void gs_manager_set_cycle_timeout (GSManager *manager,
glong cycle_timeout);
void gs_manager_set_themes (GSManager *manager,
@@ -113,7 +109,6 @@ void gs_manager_show_message (GSManager *manager,
const char *body,
const char *icon);
gboolean gs_manager_request_unlock (GSManager *manager);
-void gs_manager_cancel_unlock_request (GSManager *manager);
G_END_DECLS
diff --git a/src/gs-theme-manager.c b/src/gs-theme-manager.c
index 60edfea..fb19df6 100644
--- a/src/gs-theme-manager.c
+++ b/src/gs-theme-manager.c
@@ -151,16 +151,6 @@ add_known_engine_locations_to_path (void) {
g_string_free (str, TRUE);
}
-GSThemeInfo *
-gs_theme_info_ref (GSThemeInfo *info) {
- g_return_val_if_fail (info != NULL, NULL);
- g_return_val_if_fail (info->refcount > 0, NULL);
-
- info->refcount++;
-
- return info;
-}
-
void
gs_theme_info_unref (GSThemeInfo *info) {
g_return_if_fail (info != NULL);
@@ -257,16 +247,16 @@ find_info_for_id (GarconMenu *menu,
}
GSThemeInfo *
-gs_theme_manager_lookup_theme_info (GSThemeManager *theme_manager,
- const char *name) {
+gs_theme_manager_lookup_theme_info (GSThemeManager *manager,
+ const char *theme) {
GSThemeInfo *info;
char *id;
- g_return_val_if_fail (GS_IS_THEME_MANAGER (theme_manager), NULL);
- g_return_val_if_fail (name != NULL, NULL);
+ g_return_val_if_fail (GS_IS_THEME_MANAGER (manager), NULL);
+ g_return_val_if_fail (theme != NULL, NULL);
- id = g_strdup_printf ("%s.desktop", name);
- info = find_info_for_id (theme_manager->priv->menu, id);
+ id = g_strdup_printf ("%s.desktop", theme);
+ info = find_info_for_id (manager->priv->menu, id);
g_free (id);
return info;
@@ -300,12 +290,12 @@ make_theme_list (GSList **parent_list,
}
GSList *
-gs_theme_manager_get_info_list (GSThemeManager *theme_manager) {
+gs_theme_manager_get_info_list (GSThemeManager *manager) {
GSList *l = NULL;
- g_return_val_if_fail (GS_IS_THEME_MANAGER (theme_manager), NULL);
+ g_return_val_if_fail (GS_IS_THEME_MANAGER (manager), NULL);
- make_theme_list (&l, theme_manager->priv->menu);
+ make_theme_list (&l, manager->priv->menu);
return l;
}
diff --git a/src/gs-theme-manager.h b/src/gs-theme-manager.h
index b0803b0..e390f6e 100644
--- a/src/gs-theme-manager.h
+++ b/src/gs-theme-manager.h
@@ -56,7 +56,6 @@ GSThemeManager *gs_theme_manager_new (void);
GSList *gs_theme_manager_get_info_list (GSThemeManager *manager);
GSThemeInfo *gs_theme_manager_lookup_theme_info (GSThemeManager *manager,
const char *theme);
-GSThemeInfo *gs_theme_info_ref (GSThemeInfo *info);
void gs_theme_info_unref (GSThemeInfo *info);
const char *gs_theme_info_get_id (GSThemeInfo *info);
const char *gs_theme_info_get_name (GSThemeInfo *info);
diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
index e829b22..4354670 100644
--- a/src/gs-window-x11.c
+++ b/src/gs-window-x11.c
@@ -147,10 +147,10 @@ G_DEFINE_TYPE_WITH_PRIVATE (GSWindow, gs_window, GTK_TYPE_WINDOW)
static void
set_invisible_cursor (GdkWindow *window,
gboolean invisible) {
- GdkDisplay *display;
GdkCursor *cursor = NULL;
if (invisible) {
+ GdkDisplay *display;
display = gdk_window_get_display (window);
cursor = gdk_cursor_new_for_display (display, GDK_BLANK_CURSOR);
}
@@ -236,23 +236,6 @@ widget_clear_all_children (GtkWidget *widget) {
}
void
-gs_window_set_background_surface (GSWindow *window,
- cairo_surface_t *surface) {
- g_return_if_fail (GS_IS_WINDOW (window));
-
- if (window->priv->background_surface != NULL) {
- cairo_surface_destroy (window->priv->background_surface);
- }
- window->priv->background_surface = NULL;
-
- if (surface != NULL) {
- window->priv->background_surface = cairo_surface_reference (surface);
- }
-
- gtk_widget_queue_draw (GTK_WIDGET (window));
-}
-
-void
gs_window_clear (GSWindow *window) {
GdkDisplay *display;
g_return_if_fail (GS_IS_WINDOW (window));
@@ -727,7 +710,6 @@ select_popup_events (void) {
static void
window_select_shape_events (GSWindow *window) {
#ifdef HAVE_SHAPE_EXT
- unsigned long events;
int shape_error_base;
GdkDisplay *display;
@@ -736,7 +718,7 @@ window_select_shape_events (GSWindow *window) {
gdk_x11_display_error_trap_push (display);
if (XShapeQueryExtension (GDK_DISPLAY_XDISPLAY (display), &window->priv->shape_event_base, &shape_error_base)) {
- events = ShapeNotifyMask;
+ unsigned long events = ShapeNotifyMask;
XShapeSelectInput (GDK_DISPLAY_XDISPLAY (display),
GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window))),
events);
@@ -799,9 +781,7 @@ set_info_text_and_icon (GSWindow *window,
GtkWidget *image;
GtkWidget *vbox;
gchar *primary_markup;
- gchar *secondary_markup;
GtkWidget *primary_label;
- GtkWidget *secondary_label;
hbox_content = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox_content);
@@ -825,6 +805,8 @@ set_info_text_and_icon (GSWindow *window,
gtk_widget_set_halign (primary_label, GTK_ALIGN_START);
if (secondary_text != NULL) {
+ gchar *secondary_markup;
+ GtkWidget *secondary_label;
secondary_markup = g_strdup_printf ("<small>%s</small>",
secondary_text);
secondary_label = gtk_label_new (secondary_markup);
@@ -1037,10 +1019,10 @@ spawn_on_window (GSWindow *window,
g_io_channel_set_flags (channel,
g_io_channel_get_flags (channel) | G_IO_FLAG_NONBLOCK,
NULL);
- id = g_io_add_watch (channel,
- G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
- error_watch,
- NULL);
+ g_io_add_watch (channel,
+ G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
+ error_watch,
+ NULL);
g_io_channel_unref (channel);
g_strfreev (argv);
@@ -1535,10 +1517,10 @@ is_status_message_enabled (GSWindow *window) {
static gint
get_monitor_index (GSWindow *window) {
GdkDisplay *display = gs_window_get_display (window);
- GdkMonitor *monitor;
gint idx;
for (idx = 0; idx < gdk_display_get_n_monitors (display); idx++) {
+ GdkMonitor *monitor;
monitor = gdk_display_get_monitor (display, idx);
if (g_strcmp0 (gdk_monitor_get_model (monitor), gdk_monitor_get_model (window->priv->monitor)) == 0) {
return idx;
@@ -1752,13 +1734,13 @@ gs_window_set_status_message_enabled (GSWindow *window,
void
gs_window_set_logout_timeout (GSWindow *window,
- glong logout_timeout) {
+ glong timeout) {
g_return_if_fail (GS_IS_WINDOW (window));
- if (logout_timeout < 0) {
+ if (timeout < 0) {
window->priv->logout_timeout = 0;
} else {
- window->priv->logout_timeout = logout_timeout;
+ window->priv->logout_timeout = timeout;
}
}
diff --git a/src/gs-window.h b/src/gs-window.h
index 77e2a37..20434f7 100644
--- a/src/gs-window.h
+++ b/src/gs-window.h
@@ -65,8 +65,6 @@ void gs_window_set_monitor (GSWindow *window,
GdkMonitor *monitor);
GdkMonitor *gs_window_get_monitor (GSWindow *window);
-void gs_window_set_background_surface (GSWindow *window,
- cairo_surface_t *surface);
void gs_window_set_lock_enabled (GSWindow *window,
gboolean lock_enabled);
void gs_window_set_lock_with_saver_enabled (GSWindow *window,
diff --git a/src/subprocs.c b/src/subprocs.c
index e723833..8292875 100644
--- a/src/subprocs.c
+++ b/src/subprocs.c
@@ -119,38 +119,3 @@ signal_pid (int pid,
return status;
}
-
-#ifndef VMS
-
-void
-await_dying_children (int pid,
- gboolean debug) {
- while (1) {
- int wait_status = 0;
- pid_t kid;
-
- errno = 0;
- kid = waitpid (-1, &wait_status, WNOHANG|WUNTRACED);
-
- if (debug) {
- if (kid < 0 && errno)
- g_message ("waitpid(%d) ==> %ld (%d)", pid, (long) kid, errno);
- else if (kid != 0)
- g_message ("waitpid(%d) ==> %ld", pid, (long) kid);
- }
-
- /* 0 means no more children to reap.
- -1 means error -- except "interrupted system call" isn't a "real"
- error, so if we get that, we should just try again. */
- if (kid < 0 && errno != EINTR)
- break;
- }
-}
-
-
-#else /* VMS */
-static void await_dying_children (saver_info *si) {
- return;
-}
-#endif /* VMS */
-
diff --git a/src/subprocs.h b/src/subprocs.h
index 9648859..b07536c 100644
--- a/src/subprocs.h
+++ b/src/subprocs.h
@@ -32,8 +32,6 @@ block_sigchld (void);
int signal_pid (int pid,
int signal);
-void await_dying_children (int pid,
- gboolean debug);
G_END_DECLS
diff --git a/src/test-fade.c b/src/test-fade.c
index 961e63e..0f76221 100644
--- a/src/test-fade.c
+++ b/src/test-fade.c
@@ -84,11 +84,6 @@ main (int argc,
textdomain (GETTEXT_PACKAGE);
#endif
- if (error) {
- fprintf (stderr, "%s\n", error->message);
- exit (1);
- }
-
if (!gtk_init_with_args (&argc, &argv, NULL, NULL, NULL, &error)) {
fprintf (stderr, "%s", error->message);
g_error_free (error);
diff --git a/src/xfce-bg.c b/src/xfce-bg.c
index cea9f8e..8c4603f 100644
--- a/src/xfce-bg.c
+++ b/src/xfce-bg.c
@@ -147,17 +147,17 @@ static void pixbuf_blend (GdkPixbuf *src,
GdkPixbuf *dest,
int src_x,
int src_y,
- int width,
- int height,
+ int src_width,
+ int src_height,
int dest_x,
int dest_y,
double alpha);
/* Cache */
static GdkPixbuf * get_pixbuf_for_size (XfceBG *bg,
- gint num_monitor,
- int width,
- int height);
+ gint monitor,
+ int best_width,
+ int best_height);
static void clear_cache (XfceBG *bg);
static gboolean is_different (XfceBG *bg,
const char *filename);
@@ -301,11 +301,11 @@ queue_transitioned (XfceBG *bg) {
static gchar *
find_system_backgrounds (void) {
const gchar * const *dirs;
- gchar *path;
gint i;
dirs = g_get_system_data_dirs ();
for (i = 0; dirs[i]; i++) {
+ gchar *path;
path = g_build_path (G_DIR_SEPARATOR_S, dirs[i],
"backgrounds", "xfce", NULL);
if (g_file_test (path, G_FILE_TEST_IS_DIR))
@@ -723,8 +723,6 @@ refresh_cache_file (XfceBG *bg,
gint height) {
gchar *cache_filename;
gchar *cache_dir;
- GdkPixbufFormat *format;
- gchar *format_name;
if ((num_monitor == -1) || (width <= 300) || (height <= 300))
return;
@@ -735,9 +733,13 @@ refresh_cache_file (XfceBG *bg,
/* Only refresh scaled file on disk if useful (and don't cache slideshow) */
if (!cache_file_is_valid (bg->filename, cache_filename)) {
+ GdkPixbufFormat *format;
+
format = gdk_pixbuf_get_file_info (bg->filename, NULL, NULL);
if (format != NULL) {
+ gchar *format_name;
+
if (!g_file_test (cache_dir, G_FILE_TEST_IS_DIR)) {
g_mkdir_with_parents (cache_dir, 0700);
} else {
@@ -1189,13 +1191,11 @@ get_current_slide (SlideShow *show,
double delta = fmod (now() - show->start_time, show->total_duration);
GList *list;
double elapsed;
- int i;
if (delta < 0)
delta += show->total_duration;
elapsed = 0;
- i = 0;
for (list = show->slides->head; list != NULL; list = list->next) {
Slide *slide = list->data;
@@ -1205,7 +1205,6 @@ get_current_slide (SlideShow *show,
return slide;
}
- i++;
elapsed += slide->duration;
}
@@ -1371,7 +1370,6 @@ get_as_pixbuf_for_size (XfceBG *bg,
if ((ent = file_cache_lookup (bg, PIXBUF, filename))) {
return g_object_ref (ent->u.pixbuf);
} else {
- GdkPixbufFormat *format;
GdkPixbuf *pixbuf = NULL;
gchar *tmp = NULL;
GdkPixbuf *tmp_pixbuf;
@@ -1383,6 +1381,7 @@ get_as_pixbuf_for_size (XfceBG *bg,
if (!pixbuf) {
/* If scalable choose maximum size */
+ GdkPixbufFormat *format;
format = gdk_pixbuf_get_file_info (filename, NULL, NULL);
if (format != NULL)
tmp = gdk_pixbuf_format_get_name (format);
@@ -1518,13 +1517,13 @@ ensure_timeout (XfceBG *bg,
static time_t
get_mtime (const char *filename) {
- GFile *file;
- GFileInfo *info;
- time_t mtime;
+ time_t mtime;
mtime = (time_t)-1;
if (filename) {
+ GFile *file;
+ GFileInfo *info;
file = g_file_new_for_path (filename);
info = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_MODIFIED,
G_FILE_QUERY_INFO_NONE, NULL, NULL);
@@ -1792,8 +1791,8 @@ create_gradient (const GdkRGBA *primary,
static void
pixbuf_draw_gradient (GdkPixbuf *pixbuf,
gboolean horizontal,
- GdkRGBA *primary,
- GdkRGBA *secondary,
+ GdkRGBA *c1,
+ GdkRGBA *c2,
GdkRectangle *rect) {
int width;
int height;
@@ -1807,7 +1806,7 @@ pixbuf_draw_gradient (GdkPixbuf *pixbuf,
dst = gdk_pixbuf_get_pixels (pixbuf) + rect->x * n_channels + rowstride * rect->y;
if (horizontal) {
- guchar *gradient = create_gradient (primary, secondary, width);
+ guchar *gradient = create_gradient (c1, c2, width);
int copy_bytes_per_row = width * n_channels;
int i;
@@ -1821,7 +1820,7 @@ pixbuf_draw_gradient (GdkPixbuf *pixbuf,
guchar *gb, *gradient;
int i;
- gradient = create_gradient (primary, secondary, height);
+ gradient = create_gradient (c1, c2, height);
for (i = 0; i < height; i++) {
int j;
guchar *d;
@@ -2188,7 +2187,6 @@ read_slideshow_file (const char *filename,
gsize len;
SlideShow *show = NULL;
GMarkupParseContext *context = NULL;
- time_t t;
if (!filename)
return NULL;
@@ -2224,7 +2222,8 @@ read_slideshow_file (const char *filename,
g_markup_parse_context_free (context);
if (show) {
- int len;
+ time_t t;
+ int qlen;
t = mktime (&show->start_tm);
@@ -2232,14 +2231,14 @@ read_slideshow_file (const char *filename,
dump_bg (show);
- len = g_queue_get_length (show->slides);
+ qlen = g_queue_get_length (show->slides);
/* no slides, that's not a slideshow */
- if (len == 0) {
+ if (qlen == 0) {
slideshow_unref (show);
show = NULL;
/* one slide, there's no transition */
- } else if (len == 1) {
+ } else if (qlen == 1) {
Slide *slide = show->slides->head->data;
slide->duration = show->total_duration = G_MAXUINT;
}
diff --git a/src/xfce-rr.c b/src/xfce-rr.c
index 42b1856..615dee2 100644
--- a/src/xfce-rr.c
+++ b/src/xfce-rr.c
@@ -248,10 +248,6 @@ mode_by_id (ScreenInfo *info,
static void
screen_info_free (ScreenInfo *info) {
- XfceRROutput **output;
- XfceRRCrtc **crtc;
- XfceRRMode **mode;
-
g_assert (info != NULL);
#ifdef HAVE_RANDR
@@ -263,18 +259,21 @@ screen_info_free (ScreenInfo *info) {
#endif
if (info->outputs) {
+ XfceRROutput **output;
for (output = info->outputs; *output; ++output)
output_free (*output);
g_free (info->outputs);
}
if (info->crtcs) {
+ XfceRRCrtc **crtc;
for (crtc = info->crtcs; *crtc; ++crtc)
crtc_free (*crtc);
g_free (info->crtcs);
}
if (info->modes) {
+ XfceRRMode **mode;
for (mode = info->modes; *mode; ++mode)
mode_free (*mode);
g_free (info->modes);
@@ -479,7 +478,6 @@ fill_out_screen_info (Display *xdisplay,
&(info->max_height));
}
- info->primary = None;
display = gdk_display_get_default ();
gdk_x11_display_error_trap_push (display);
info->primary = XRRGetOutputPrimary (xdisplay, xroot);
diff --git a/src/xfce4-screensaver-gl-helper.c b/src/xfce4-screensaver-gl-helper.c
index a3d3a50..4041e50 100644
--- a/src/xfce4-screensaver-gl-helper.c
+++ b/src/xfce4-screensaver-gl-helper.c
@@ -36,7 +36,6 @@ main (int argc,
char **argv) {
GdkDisplay *display;
GdkVisual *visual;
- Visual *xvisual;
GError *error = NULL;
#ifdef ENABLE_NLS
@@ -62,6 +61,7 @@ main (int argc,
visual = gs_visual_gl_get_best_for_display (display);
if (visual != NULL) {
+ Visual *xvisual;
xvisual = gdk_x11_visual_get_xvisual (visual);
printf ("0x%x\n", (unsigned int) XVisualIDFromVisual (xvisual));
} else {
diff --git a/src/xfce4-screensaver-preferences.c b/src/xfce4-screensaver-preferences.c
index c58667f..08b3361 100644
--- a/src/xfce4-screensaver-preferences.c
+++ b/src/xfce4-screensaver-preferences.c
@@ -247,19 +247,19 @@ config_get_theme (gboolean *is_writable) {
static gchar **
get_all_theme_ids (GSThemeManager *theme_manager) {
gchar **ids = NULL;
- GSList *entries;
+ GSList *themes;
GSList *l;
guint idx = 0;
- entries = gs_theme_manager_get_info_list (theme_manager);
- ids = g_new0 (gchar *, g_slist_length (entries) + 1);
- for (l = entries; l; l = l->next) {
+ themes = gs_theme_manager_get_info_list (theme_manager);
+ ids = g_new0 (gchar *, g_slist_length (themes) + 1);
+ for (l = themes; l; l = l->next) {
GSThemeInfo *info = l->data;
ids[idx++] = g_strdup (gs_theme_info_get_id (info));
gs_theme_info_unref (info);
}
- g_slist_free (entries);
+ g_slist_free (themes);
return ids;
}
@@ -2136,8 +2136,6 @@ finalize_capplet (void) {
int
main (int argc,
char **argv) {
- GtkWidget *plug;
- GObject *plug_child;
GError *error = NULL;
#ifdef ENABLE_NLS
@@ -2189,6 +2187,9 @@ main (int argc,
gtk_main();
} else {
+ GtkWidget *plug;
+ GObject *plug_child;
+
/* Create plug widget */
plug = gtk_plug_new(opt_socket_id);
g_signal_connect(plug, "delete-event", G_CALLBACK(gtk_main_quit), NULL);
diff --git a/src/xfcekbd-indicator-config.h b/src/xfcekbd-indicator-config.h
index a3a5aaf..e139e67 100644
--- a/src/xfcekbd-indicator-config.h
+++ b/src/xfcekbd-indicator-config.h
@@ -44,19 +44,19 @@ struct _XfcekbdIndicatorConfig {
* some of them require XfcekbdKeyboardConfig as well -
* for loading approptiate images
*/
-void xfcekbd_indicator_config_init (XfcekbdIndicatorConfig *applet_config,
+void xfcekbd_indicator_config_init (XfcekbdIndicatorConfig *ind_config,
XklEngine *engine);
-void xfcekbd_indicator_config_term (XfcekbdIndicatorConfig *applet_config);
+void xfcekbd_indicator_config_term (XfcekbdIndicatorConfig *ind_config);
-void xfcekbd_indicator_config_load_from_xfconf (XfcekbdIndicatorConfig *applet_config);
+void xfcekbd_indicator_config_load_from_xfconf (XfcekbdIndicatorConfig *ind_config);
/* Should be updated on Indicator/Xfconf configuration change */
-void xfcekbd_indicator_config_activate (XfcekbdIndicatorConfig *applet_config);
+void xfcekbd_indicator_config_activate (XfcekbdIndicatorConfig *ind_config);
-void xfcekbd_indicator_config_start_listen (XfcekbdIndicatorConfig *applet_config,
+void xfcekbd_indicator_config_start_listen (XfcekbdIndicatorConfig *ind_config,
GCallback func,
gpointer user_data);
-void xfcekbd_indicator_config_stop_listen (XfcekbdIndicatorConfig *applet_config);
+void xfcekbd_indicator_config_stop_listen (XfcekbdIndicatorConfig *ind_config);
#endif /* SRC_XFCEKBD_INDICATOR_CONFIG_H_ */
diff --git a/src/xfcekbd-indicator.c b/src/xfcekbd-indicator.c
index d4bdf02..5c34646 100644
--- a/src/xfcekbd-indicator.c
+++ b/src/xfcekbd-indicator.c
@@ -45,7 +45,6 @@ typedef struct _gki_globals {
gchar **full_group_names;
gchar **short_group_names;
GSList *widget_instances;
- GSList *images;
gboolean redraw_queued;
} gki_globals;
diff --git a/src/xfcekbd-indicator.h b/src/xfcekbd-indicator.h
index fe532ed..f210a61 100644
--- a/src/xfcekbd-indicator.h
+++ b/src/xfcekbd-indicator.h
@@ -59,7 +59,7 @@ extern GType xfcekbd_indicator_get_type (void);
extern GtkWidget * xfcekbd_indicator_new (void);
extern void xfcekbd_indicator_set_parent_tooltips (XfcekbdIndicator *gki,
- gboolean ifset);
+ gboolean spt);
#ifdef __cplusplus
}
diff --git a/src/xfcekbd-keyboard-config.c b/src/xfcekbd-keyboard-config.c
index d87e8cb..ddaf269 100644
--- a/src/xfcekbd-keyboard-config.c
+++ b/src/xfcekbd-keyboard-config.c
@@ -94,7 +94,7 @@ xfcekbd_keyboard_config_split_items (const gchar *merged,
static void
xfcekbd_keyboard_config_copy_from_xkl_config (XfcekbdKeyboardConfig *kbd_config,
XklConfigRec *pdata) {
- char **p, **p1;
+ char **p;
int i;
xfcekbd_keyboard_config_model_set (kbd_config, pdata->model);
@@ -104,19 +104,17 @@ xfcekbd_keyboard_config_copy_from_xkl_config (XfcekbdKeyboardConfig *kbd_config,
g_strfreev (kbd_config->layouts_variants);
kbd_config->layouts_variants = NULL;
if (pdata->layouts != NULL) {
+ char **p1;
p = pdata->layouts;
p1 = pdata->variants;
- kbd_config->layouts_variants =
- g_new0 (gchar *, g_strv_length (pdata->layouts) + 1);
+ kbd_config->layouts_variants = g_new0 (gchar *, g_strv_length (pdata->layouts) + 1);
i = 0;
while (*p != NULL) {
- const gchar *full_layout =
- xfcekbd_keyboard_config_merge_items (*p, *p1);
+ const gchar *full_layout = xfcekbd_keyboard_config_merge_items (*p, *p1);
xkl_debug (150,
- "Loaded Kbd layout (with variant): [%s]\n",
- full_layout);
- kbd_config->layouts_variants[i++] =
- g_strdup (full_layout);
+ "Loaded Kbd layout (with variant): [%s]\n",
+ full_layout);
+ kbd_config->layouts_variants[i++] = g_strdup (full_layout);
p++;
p1++;
}
@@ -128,26 +126,20 @@ xfcekbd_keyboard_config_copy_from_xkl_config (XfcekbdKeyboardConfig *kbd_config,
if (pdata->options != NULL) {
p = pdata->options;
- kbd_config->options =
- g_new0 (gchar *, g_strv_length (pdata->options) + 1);
+ kbd_config->options = g_new0 (gchar *, g_strv_length (pdata->options) + 1);
i = 0;
while (*p != NULL) {
- char group[XKL_MAX_CI_NAME_LENGTH];
char *option = *p;
- char *delim =
- (option != NULL) ? strchr (option, ':') : NULL;
+ char *delim = (option != NULL) ? strchr (option, ':') : NULL;
int len;
- if ((delim != NULL) &&
- ((len =
- (delim - option)) <
- XKL_MAX_CI_NAME_LENGTH)) {
+ if ((delim != NULL) && ((len = (delim - option)) < XKL_MAX_CI_NAME_LENGTH)) {
+ char group[XKL_MAX_CI_NAME_LENGTH];
strncpy (group, option, len);
group[len] = 0;
xkl_debug (150,
- "Loaded Kbd option: [%s][%s]\n",
- group, option);
- xfcekbd_keyboard_config_options_set
- (kbd_config, i++, group, option);
+ "Loaded Kbd option: [%s][%s]\n",
+ group, option);
+ xfcekbd_keyboard_config_options_set (kbd_config, i++, group, option);
}
p++;
}
diff --git a/src/xfcekbd-keyboard-config.h b/src/xfcekbd-keyboard-config.h
index fe38779..ca58666 100644
--- a/src/xfcekbd-keyboard-config.h
+++ b/src/xfcekbd-keyboard-config.h
@@ -52,7 +52,7 @@ extern void xfcekbd_keyboard_config_init (Xfcekbd
extern void xfcekbd_keyboard_config_term (XfcekbdKeyboardConfig *kbd_config);
extern void xfcekbd_keyboard_config_load_from_x_current (XfcekbdKeyboardConfig *kbd_config,
- XklConfigRec *buf);
+ XklConfigRec *data);
extern gboolean xfcekbd_keyboard_config_split_items (const gchar *merged,
gchar **parent,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list