summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrbuj <[email protected]>2021-10-27 18:10:58 +0200
committerraveit65 <[email protected]>2021-11-24 21:23:48 +0100
commitaf8ed3f669480ed03b0b1e47acf58962b6184e43 (patch)
tree935dac2c2fa8e1eaec4da0ec0178cffad7b345f8
parent34aafe51a3b610a1f3b957b92141f49574e833d5 (diff)
downloadmate-session-manager-master.tar.bz2
mate-session-manager-master.tar.xz
Use a blank line at mostHEADmaster
-rw-r--r--capplet/gsm-properties-dialog.c3
-rw-r--r--capplet/gsp-app-manager.c1
-rw-r--r--capplet/gsp-app.c3
-rw-r--r--mate-session/gs-idle-monitor.h1
-rw-r--r--mate-session/gsm-autostart-app.c1
-rw-r--r--mate-session/gsm-client.c1
-rw-r--r--mate-session/gsm-client.h2
-rw-r--r--mate-session/gsm-consolekit.c3
-rw-r--r--mate-session/gsm-dbus-client.c1
-rw-r--r--mate-session/gsm-inhibit-dialog.c2
-rw-r--r--mate-session/gsm-manager.c6
-rw-r--r--mate-session/gsm-manager.h2
-rw-r--r--mate-session/gsm-store.c1
-rw-r--r--mate-session/gsm-store.h1
-rw-r--r--mate-session/gsm-systemd.c2
-rw-r--r--mate-session/gsm-util.c1
-rw-r--r--mate-session/gsm-xsmp-client.c5
-rw-r--r--mate-session/gsm-xsmp-client.h1
-rw-r--r--mate-session/gsm-xsmp-server.c1
-rw-r--r--mate-session/gsm-xsmp-server.h1
-rw-r--r--mate-session/mdm-signal-handler.c1
-rw-r--r--mate-session/msm-gnome.c6
22 files changed, 0 insertions, 46 deletions
diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
index a67d81a..dd0b1d5 100644
--- a/capplet/gsm-properties-dialog.c
+++ b/capplet/gsm-properties-dialog.c
@@ -671,7 +671,6 @@ setup_dialog (GsmPropertiesDialog *dialog)
NULL);
gtk_tree_view_append_column (treeview, column);
-
gtk_tree_view_column_set_sort_column_id (column, STORE_COL_DESCRIPTION);
gtk_tree_view_set_search_column (treeview, STORE_COL_SEARCH);
@@ -716,7 +715,6 @@ setup_dialog (GsmPropertiesDialog *dialog)
STORE_COL_DESCRIPTION,
GTK_SORT_ASCENDING);
-
button = GTK_WIDGET (gtk_builder_get_object (dialog->xml,
CAPPLET_ADD_WIDGET_NAME));
dialog->add_button = button;
@@ -741,7 +739,6 @@ setup_dialog (GsmPropertiesDialog *dialog)
G_CALLBACK (on_edit_app_clicked),
dialog);
-
button = GTK_WIDGET (gtk_builder_get_object (dialog->xml,
CAPPLET_REMEMBER_WIDGET_NAME));
diff --git a/capplet/gsp-app-manager.c b/capplet/gsp-app-manager.c
index 3f663ad..6d3b0f5 100644
--- a/capplet/gsp-app-manager.c
+++ b/capplet/gsp-app-manager.c
@@ -48,7 +48,6 @@ enum {
static guint gsp_app_manager_signals[LAST_SIGNAL] = { 0 };
-
G_DEFINE_TYPE_WITH_PRIVATE (GspAppManager, gsp_app_manager, G_TYPE_OBJECT)
static void gsp_app_manager_dispose (GObject *object);
diff --git a/capplet/gsp-app.c b/capplet/gsp-app.c
index bd55353..e823a53 100644
--- a/capplet/gsp-app.c
+++ b/capplet/gsp-app.c
@@ -89,14 +89,12 @@ enum {
static guint gsp_app_signals[LAST_SIGNAL] = { 0 };
-
G_DEFINE_TYPE_WITH_PRIVATE (GspApp, gsp_app, G_TYPE_OBJECT)
static void gsp_app_dispose (GObject *object);
static void gsp_app_finalize (GObject *object);
static gboolean _gsp_app_save (gpointer data);
-
static gboolean
_gsp_str_equal (const char *a,
const char *b)
@@ -116,7 +114,6 @@ _gsp_str_equal (const char *a,
return FALSE;
}
-
static void
gsp_app_class_init (GspAppClass *class)
{
diff --git a/mate-session/gs-idle-monitor.h b/mate-session/gs-idle-monitor.h
index d547d0d..0eb316b 100644
--- a/mate-session/gs-idle-monitor.h
+++ b/mate-session/gs-idle-monitor.h
@@ -47,7 +47,6 @@ void gs_idle_monitor_remove_watch (GSIdleMonitor *monitor,
guint id);
void gs_idle_monitor_reset (GSIdleMonitor *monitor);
-
G_END_DECLS
#endif /* __GS_IDLE_MONITOR_H */
diff --git a/mate-session/gsm-autostart-app.c b/mate-session/gsm-autostart-app.c
index 29d66f5..079bfa1 100644
--- a/mate-session/gsm-autostart-app.c
+++ b/mate-session/gsm-autostart-app.c
@@ -1054,7 +1054,6 @@ gsm_autostart_app_provides (GsmApp *app,
GsmAutostartApp *aapp;
GsmAutostartAppPrivate *priv;
-
g_return_val_if_fail (GSM_IS_APP (app), FALSE);
aapp = GSM_AUTOSTART_APP (app);
diff --git a/mate-session/gsm-client.c b/mate-session/gsm-client.c
index 87bdd37..8dc4005 100644
--- a/mate-session/gsm-client.c
+++ b/mate-session/gsm-client.c
@@ -526,7 +526,6 @@ gsm_client_cancel_end_session (GsmClient *client,
return GSM_CLIENT_GET_CLASS (client)->impl_cancel_end_session (client, error);
}
-
gboolean
gsm_client_query_end_session (GsmClient *client,
guint flags,
diff --git a/mate-session/gsm-client.h b/mate-session/gsm-client.h
index 95e93be..ff3012f 100644
--- a/mate-session/gsm-client.h
+++ b/mate-session/gsm-client.h
@@ -97,13 +97,11 @@ GQuark gsm_client_error_quark (void);
const char *gsm_client_peek_id (GsmClient *client);
-
const char * gsm_client_peek_startup_id (GsmClient *client);
const char * gsm_client_peek_app_id (GsmClient *client);
guint gsm_client_peek_restart_style_hint (GsmClient *client);
guint gsm_client_peek_status (GsmClient *client);
-
char *gsm_client_get_app_name (GsmClient *client);
void gsm_client_set_app_id (GsmClient *client,
const char *app_id);
diff --git a/mate-session/gsm-consolekit.c b/mate-session/gsm-consolekit.c
index 5930269..6ff7644 100644
--- a/mate-session/gsm-consolekit.c
+++ b/mate-session/gsm-consolekit.c
@@ -545,7 +545,6 @@ gsm_consolekit_attempt_hibernate (GsmConsolekit *manager)
G_TYPE_INVALID,
G_TYPE_INVALID);
-
if (!res) {
g_warning ("Unable to hibernate system: %s", error->message);
g_error_free (error);
@@ -710,7 +709,6 @@ gsm_consolekit_set_session_idle (GsmConsolekit *manager,
goto out;
}
-
g_debug ("Updating ConsoleKit idle status: %d", is_idle);
message = dbus_message_new_method_call (CK_NAME,
session_id,
@@ -1065,7 +1063,6 @@ out:
return ret;
}
-
GsmConsolekit *
gsm_get_consolekit (void)
{
diff --git a/mate-session/gsm-dbus-client.c b/mate-session/gsm-dbus-client.c
index d6c0ef0..69d723a 100644
--- a/mate-session/gsm-dbus-client.c
+++ b/mate-session/gsm-dbus-client.c
@@ -190,7 +190,6 @@ handle_end_session_response (GsmDBusClient *client,
gsm_client_end_session_response (GSM_CLIENT (client),
is_ok, FALSE, FALSE, reason);
-
if (! dbus_connection_send (client->connection, reply, NULL)) {
g_error ("No memory");
}
diff --git a/mate-session/gsm-inhibit-dialog.c b/mate-session/gsm-inhibit-dialog.c
index 73c322c..f8f50e6 100644
--- a/mate-session/gsm-inhibit-dialog.c
+++ b/mate-session/gsm-inhibit-dialog.c
@@ -281,7 +281,6 @@ _load_icon (GtkIconTheme *icon_theme,
return retval;
}
-
static GdkPixbuf *
scale_pixbuf (GdkPixbuf *pixbuf,
int max_width,
@@ -734,7 +733,6 @@ gsm_inhibit_dialog_set_inhibitor_store (GsmInhibitDialog *dialog,
g_object_unref (dialog->inhibitors);
}
-
g_debug ("GsmInhibitDialog: setting store %p", store);
dialog->inhibitors = store;
diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
index 9b5374e..6fa2722 100644
--- a/mate-session/gsm-manager.c
+++ b/mate-session/gsm-manager.c
@@ -83,7 +83,6 @@
#define GDM_FLEXISERVER_COMMAND "gdmflexiserver"
#define GDM_FLEXISERVER_ARGS "--startnew Standard"
-
#define LOCKDOWN_SCHEMA "org.mate.lockdown"
#define KEY_LOCK_DISABLE "disable-lock-screen"
#define KEY_LOG_OUT_DISABLE "disable-log-out"
@@ -768,7 +767,6 @@ typedef struct {
guint flags;
} ClientEndSessionData;
-
static gboolean
_client_end_session (GsmClient *client,
ClientEndSessionData *data)
@@ -1877,7 +1875,6 @@ _disconnect_client (GsmManager *manager,
goto out;
}
-
if (app == NULL) {
g_debug ("GsmManager: unable to find application for client - not restarting");
goto out;
@@ -2494,7 +2491,6 @@ gsm_manager_set_client_store (GsmManager *manager,
g_object_unref (priv->clients);
}
-
g_debug ("GsmManager: setting client store %p", store);
priv->clients = store;
@@ -3349,7 +3345,6 @@ request_hibernate (GsmManager *manager)
gtk_widget_show (priv->inhibit_dialog);
}
-
static void
request_logout (GsmManager *manager,
GsmManagerLogoutMode mode)
@@ -4093,7 +4088,6 @@ gsm_manager_get_inhibitors (GsmManager *manager,
return TRUE;
}
-
static gboolean
_app_has_autostart_condition (const char *id,
GsmApp *app,
diff --git a/mate-session/gsm-manager.h b/mate-session/gsm-manager.h
index db9743c..4c0cb54 100644
--- a/mate-session/gsm-manager.h
+++ b/mate-session/gsm-manager.h
@@ -19,7 +19,6 @@
*
*/
-
#ifndef __GSM_MANAGER_H
#define __GSM_MANAGER_H
@@ -113,7 +112,6 @@ gboolean gsm_manager_add_legacy_session_apps (GsmManager *
void gsm_manager_start (GsmManager *manager);
-
/* exported methods */
gboolean gsm_manager_register_client (GsmManager *manager,
diff --git a/mate-session/gsm-store.c b/mate-session/gsm-store.c
index de13a33..6a62805 100644
--- a/mate-session/gsm-store.c
+++ b/mate-session/gsm-store.c
@@ -156,7 +156,6 @@ gsm_store_lookup (GsmStore *store,
return object;
}
-
typedef struct
{
GsmStoreFunc func;
diff --git a/mate-session/gsm-store.h b/mate-session/gsm-store.h
index 0474f77..fe1b1a5 100644
--- a/mate-session/gsm-store.h
+++ b/mate-session/gsm-store.h
@@ -19,7 +19,6 @@
*
*/
-
#ifndef __GSM_STORE_H
#define __GSM_STORE_H
diff --git a/mate-session/gsm-systemd.c b/mate-session/gsm-systemd.c
index b463bbe..f11a26b 100644
--- a/mate-session/gsm-systemd.c
+++ b/mate-session/gsm-systemd.c
@@ -633,7 +633,6 @@ out:
}
}
-
void
gsm_systemd_set_session_idle (GsmSystemd *manager,
gboolean is_idle)
@@ -1009,7 +1008,6 @@ gsm_systemd_get_current_session_type (GsmSystemd *manager)
return session_class;
}
-
GsmSystemd *
gsm_get_systemd (void)
{
diff --git a/mate-session/gsm-util.c b/mate-session/gsm-util.c
index 6799cd0..a760fc3 100644
--- a/mate-session/gsm-util.c
+++ b/mate-session/gsm-util.c
@@ -235,7 +235,6 @@ gsm_util_get_saved_session_dir (void)
return _saved_session_dir;
}
-
char **
gsm_util_get_autostart_dirs ()
{
diff --git a/mate-session/gsm-xsmp-client.c b/mate-session/gsm-xsmp-client.c
index 8db3390..17bca6f 100644
--- a/mate-session/gsm-xsmp-client.c
+++ b/mate-session/gsm-xsmp-client.c
@@ -215,7 +215,6 @@ gsm_xsmp_client_init (GsmXSMPClient *client)
priv->next_save_yourself_allow_interact = FALSE;
}
-
static void
delete_property (GsmXSMPClient *client,
const char *name)
@@ -248,7 +247,6 @@ delete_property (GsmXSMPClient *client,
SmFreeProperty (prop);
}
-
static void
debug_print_property (SmProp *prop)
{
@@ -280,7 +278,6 @@ debug_print_property (SmProp *prop)
}
}
-
static void
set_properties_callback (SmsConn conn,
SmPointer manager_data,
@@ -1106,7 +1103,6 @@ register_client_callback (SmsConn conn,
priv->description,
previous_id ? previous_id : "NULL");
-
/* There are three cases:
* 1. id is NULL - we'll use a new one
* 2. id is known - we'll use known one
@@ -1153,7 +1149,6 @@ register_client_callback (SmsConn conn,
return TRUE;
}
-
static void
save_yourself_request_callback (SmsConn conn,
SmPointer manager_data,
diff --git a/mate-session/gsm-xsmp-client.h b/mate-session/gsm-xsmp-client.h
index c9ec9b8..917cf91 100644
--- a/mate-session/gsm-xsmp-client.h
+++ b/mate-session/gsm-xsmp-client.h
@@ -41,7 +41,6 @@ struct _GsmXSMPClientClass
gboolean (*logout_request) (GsmXSMPClient *client,
gboolean prompt);
-
void (*saved_state) (GsmXSMPClient *client);
void (*request_phase2) (GsmXSMPClient *client);
diff --git a/mate-session/gsm-xsmp-server.c b/mate-session/gsm-xsmp-server.c
index b908fb7..719d65c 100644
--- a/mate-session/gsm-xsmp-server.c
+++ b/mate-session/gsm-xsmp-server.c
@@ -529,7 +529,6 @@ update_iceauthority (GsmXsmpServer *server,
return ok;
}
-
static void
setup_listener (GsmXsmpServer *server)
{
diff --git a/mate-session/gsm-xsmp-server.h b/mate-session/gsm-xsmp-server.h
index a82bc17..2e1f934 100644
--- a/mate-session/gsm-xsmp-server.h
+++ b/mate-session/gsm-xsmp-server.h
@@ -19,7 +19,6 @@
*
*/
-
#ifndef __GSM_XSMP_SERVER_H
#define __GSM_XSMP_SERVER_H
diff --git a/mate-session/mdm-signal-handler.c b/mate-session/mdm-signal-handler.c
index b2b00ac..dd03087 100644
--- a/mate-session/mdm-signal-handler.c
+++ b/mate-session/mdm-signal-handler.c
@@ -233,7 +233,6 @@ static gboolean crashlogger_get_backtrace(void)
return success;
}
-
static void mdm_signal_handler_backtrace(void)
{
struct stat s;
diff --git a/mate-session/msm-gnome.c b/mate-session/msm-gnome.c
index db5a153..ce47b72 100644
--- a/mate-session/msm-gnome.c
+++ b/mate-session/msm-gnome.c
@@ -47,7 +47,6 @@
#define GNOME_KEYRING_DAEMON "gnome-keyring-daemon"
-
static gboolean gnome_compat_started = FALSE;
static Window gnome_smproxy_window = None;
@@ -91,8 +90,6 @@ gnome_keyring_daemon_startup (void)
g_child_watch_add (pid, gnome_keyring_daemon_finished, NULL);
}
-
-
static void
msm_compat_gnome_smproxy_startup (void)
{
@@ -129,7 +126,6 @@ msm_compat_gnome_smproxy_startup (void)
gdk_x11_display_error_trap_pop_ignored (gdkdisplay);
}
-
static void
msm_compat_gnome_smproxy_shutdown (void)
{
@@ -147,7 +143,6 @@ msm_compat_gnome_smproxy_shutdown (void)
gdk_x11_display_error_trap_pop_ignored (gdkdisplay);
}
-
void
msm_gnome_start (void)
{
@@ -182,7 +177,6 @@ msm_gnome_start (void)
g_object_unref (settings);
}
-
void
msm_gnome_stop (void)
{