diff options
| author | Olaf Hering <olaf@aepfle.de> | 2020-12-04 19:17:07 +0100 |
|---|---|---|
| committer | Simon Steinbeiß <ochosi@xfce.org> | 2020-12-05 23:24:43 +0100 |
| commit | 444a746be12ace9ddfa20bb1f2531b58ad603d75 (patch) | |
| tree | b6bde83ede53477b76b1a1c5e19f04fa84ed2ccd /xfce4-session | |
| parent | f58961ed8fcebd0b5bc847f38ac4c55d9e52fe1a (diff) | |
| download | xfce4-session-444a746be12ace9ddfa20bb1f2531b58ad603d75.tar.gz | |
Remove GSourceFunc casts
Convert the callback into a real GSourceFunc.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Diffstat (limited to 'xfce4-session')
| -rw-r--r-- | xfce4-session/xfce-screensaver.c | 6 | ||||
| -rw-r--r-- | xfce4-session/xfsm-manager.c | 13 |
2 files changed, 12 insertions, 7 deletions
diff --git a/xfce4-session/xfce-screensaver.c b/xfce4-session/xfce-screensaver.c index 2fa3d9a3..d7fccf29 100644 --- a/xfce4-session/xfce-screensaver.c +++ b/xfce4-session/xfce-screensaver.c @@ -372,8 +372,10 @@ xfce_screensaver_new (void) } static gboolean -xfce_reset_screen_saver (XfceScreenSaver *saver) +xfce_reset_screen_saver (gpointer user_data) { + XfceScreenSaver *saver = user_data; + TRACE("entering\n"); /* If we found an interface during the setup, use it */ @@ -432,7 +434,7 @@ xfce_screensaver_inhibit (XfceScreenSaver *saver, { /* Reset the screensaver timers every so often so they don't activate */ saver->priv->screensaver_id = g_timeout_add_seconds (20, - (GSourceFunc)xfce_reset_screen_saver, + xfce_reset_screen_saver, saver); } return; diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c index 10394589..f2002e0d 100644 --- a/xfce4-session/xfsm-manager.c +++ b/xfce4-session/xfsm-manager.c @@ -136,7 +136,6 @@ int xfsm_splash_screen_choose (GList *sessions, gchar **name_return); static void xfsm_manager_finalize (GObject *obj); -static gboolean xfsm_manager_startup (XfsmManager *manager); static void xfsm_manager_start_client_save_timeout (XfsmManager *manager, XfsmClient *client); static void xfsm_manager_cancel_client_save_timeout (XfsmManager *manager, @@ -268,8 +267,10 @@ xfsm_manager_new (GDBusConnection *connection) static gboolean -xfsm_manager_startup (XfsmManager *manager) +xfsm_manager_startup (gpointer user_data) { + XfsmManager *manager = user_data; + xfsm_startup_foreign (manager); g_queue_sort (manager->pending_properties, (GCompareDataFunc) G_CALLBACK (xfsm_properties_compare), NULL); xfsm_startup_begin (manager); @@ -825,7 +826,7 @@ xfsm_manager_restart (XfsmManager *manager) /* setup legacy application handling */ xfsm_legacy_init (); - g_idle_add ((GSourceFunc) xfsm_manager_startup, manager); + g_idle_add (xfsm_manager_startup, manager); return TRUE; } @@ -1601,8 +1602,10 @@ xfsm_manager_terminate_client (XfsmManager *manager, static gboolean -manager_quit_signal (XfsmManager *manager) +manager_quit_signal (gpointer user_data) { + XfsmManager *manager = user_data; + g_signal_emit(G_OBJECT(manager), manager_signals[MANAGER_QUIT], 0); return FALSE; } @@ -1665,7 +1668,7 @@ xfsm_manager_perform_shutdown (XfsmManager *manager) /* give all clients the chance to close the connection */ manager->die_timeout_id = g_timeout_add (DIE_TIMEOUT, - (GSourceFunc) manager_quit_signal, + manager_quit_signal, manager); } |