[gnome-kiosk/more-crust-removal: 3/3] compositor: Delete g_autoptr blank lines
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-kiosk/more-crust-removal: 3/3] compositor: Delete g_autoptr blank lines
- Date: Fri, 29 Jul 2022 17:46:02 +0000 (UTC)
commit 3c33b4e6e3ad753733687949c503d18aa4fb185a
Author: Ray Strode <rstrode redhat com>
Date: Fri Jul 29 13:44:12 2022 -0400
compositor: Delete g_autoptr blank lines
We've now fixed the uncrustify config to not add a blank line
before g_autoptr, but we've already merged those blank lines into
the code.
This commits the output of
╎❯ find -name '*.c' -exec sed -z -e 's/\n\n\([ ]*g_autoptr.*\)$/\n\1/g' -i "{}" \;
to mop that up.
compositor/kiosk-backgrounds.c | 1 -
compositor/kiosk-compositor.c | 1 -
compositor/kiosk-dbus-utils.c | 1 -
compositor/kiosk-gobject-utils.c | 1 -
compositor/kiosk-input-sources-manager.c | 1 -
compositor/kiosk-shell-service.c | 1 -
input-selector/kiosk-input-selector-application.c | 1 -
7 files changed, 7 deletions(-)
---
diff --git a/compositor/kiosk-backgrounds.c b/compositor/kiosk-backgrounds.c
index d4d8141..32a8daf 100644
--- a/compositor/kiosk-backgrounds.c
+++ b/compositor/kiosk-backgrounds.c
@@ -84,7 +84,6 @@ create_background_for_monitor (KioskBackgrounds *self,
MetaRectangle geometry;
ClutterActor *background_actor = NULL;
MetaBackgroundContent *background_content;
-
g_autoptr (MetaBackground) background = NULL;
ClutterColor color;
diff --git a/compositor/kiosk-compositor.c b/compositor/kiosk-compositor.c
index 9ce925c..4d9c94d 100644
--- a/compositor/kiosk-compositor.c
+++ b/compositor/kiosk-compositor.c
@@ -213,7 +213,6 @@ static void
kiosk_compositor_start (MetaPlugin *plugin)
{
KioskCompositor *self = KIOSK_COMPOSITOR (plugin);
-
g_autoptr (GError) error = NULL;
g_set_weak_pointer (&self->display, meta_plugin_get_display (META_PLUGIN (self)));
diff --git a/compositor/kiosk-dbus-utils.c b/compositor/kiosk-dbus-utils.c
index 6feb261..b6aaef8 100644
--- a/compositor/kiosk-dbus-utils.c
+++ b/compositor/kiosk-dbus-utils.c
@@ -127,7 +127,6 @@ kiosk_dbus_utils_register_error_domain (GQuark error_domain,
const char *error_domain_string;
g_autofree char *type_name = NULL;
GType type;
-
g_autoptr (GTypeClass) type_class = NULL;
const GEnumClass *enum_class;
guint i;
diff --git a/compositor/kiosk-gobject-utils.c b/compositor/kiosk-gobject-utils.c
index 79cc728..a2867fa 100644
--- a/compositor/kiosk-gobject-utils.c
+++ b/compositor/kiosk-gobject-utils.c
@@ -48,7 +48,6 @@ kiosk_gobject_utils_queue_callback (GObject *self,
gpointer user_data)
{
g_autofree char *data_key = NULL;
-
g_autoptr (GSource) source = NULL;
GTask *task;
diff --git a/compositor/kiosk-input-sources-manager.c b/compositor/kiosk-input-sources-manager.c
index bae2c65..24b7647 100644
--- a/compositor/kiosk-input-sources-manager.c
+++ b/compositor/kiosk-input-sources-manager.c
@@ -354,7 +354,6 @@ export_input_source_object_to_dbus_service (KioskInputSourcesManager *self,
const char *full_name)
{
g_autoptr (GDBusInterface) dbus_input_source = NULL;
-
g_autoptr (GDBusObject) object_path = NULL;
dbus_input_source = g_dbus_object_manager_get_interface (G_DBUS_OBJECT_MANAGER
(self->dbus_object_manager),
diff --git a/compositor/kiosk-shell-service.c b/compositor/kiosk-shell-service.c
index 8e72ebc..a6b4258 100644
--- a/compositor/kiosk-shell-service.c
+++ b/compositor/kiosk-shell-service.c
@@ -314,7 +314,6 @@ kiosk_shell_service_handle_grab_accelerators (KioskShellDBusService *object,
GVariant *accelerators)
{
KioskShellService *self = KIOSK_SHELL_SERVICE (object);
-
g_autoptr (GVariantIter) iter = NULL;
GVariantBuilder builder;
const char *client_unique_name;
diff --git a/input-selector/kiosk-input-selector-application.c
b/input-selector/kiosk-input-selector-application.c
index 31080b5..177381b 100644
--- a/input-selector/kiosk-input-selector-application.c
+++ b/input-selector/kiosk-input-selector-application.c
@@ -55,7 +55,6 @@ static void
set_menu_label_from_selected_input_source (KioskInputSelectorApplication *self)
{
const char *object_path;
-
g_autoptr (GDBusObject) object = NULL;
g_autoptr (KioskInputSource) input_source = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]