From 941ab7c4626e66537755cab9285f5a437fc6d888 Mon Sep 17 00:00:00 2001 From: William Wold Date: Fri, 16 Oct 2020 11:02:14 -0700 Subject: Use C-style comments --- src/daemon/daemon.c | 32 ++++++++++++++++---------------- src/daemon/engines.c | 6 +++--- src/daemon/stack.c | 6 +++--- src/daemon/wayland.h | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c index c42b2e6..bcc8625 100644 --- a/src/daemon/daemon.c +++ b/src/daemon/daemon.c @@ -43,7 +43,7 @@ #define WNCK_I_KNOW_THIS_IS_UNSTABLE #include -#endif // HAVE_X11 +#endif /* HAVE_X11 */ #include "daemon.h" #include "engines.h" @@ -95,7 +95,7 @@ typedef struct { guint paused : 1; #ifdef HAVE_X11 Window src_window_xid; -#endif // HAVE_X11 +#endif /* HAVE_X11 */ } NotifyTimeout; typedef struct { @@ -103,7 +103,7 @@ typedef struct { gsize n_stacks; #ifdef HAVE_X11 Atom workarea_atom; -#endif // HAVE_X11 +#endif /* HAVE_X11 */ } NotifyScreen; struct _NotifyDaemon { @@ -141,7 +141,7 @@ static NotifyStackLocation get_stack_location_from_string(const gchar *slocation static GdkFilterReturn _notify_x11_filter(GdkXEvent* xevent, GdkEvent* event, NotifyDaemon* daemon); static void sync_notification_position(NotifyDaemon* daemon, GtkWindow* nw, Window source); static void monitor_notification_source_windows(NotifyDaemon* daemon, NotifyTimeout* nt, Window source); -#endif // HAVE_X11 +#endif /* HAVE_X11 */ static gboolean notify_daemon_notify_handler(NotifyDaemonNotifications *object, GDBusMethodInvocation *invocation, const gchar *app_name, guint id, const gchar *icon, const gchar *summary, const gchar *body, const gchar *const *actions, GVariant *hints, gint timeout, gpointer user_data); static gboolean notify_daemon_close_notification_handler(NotifyDaemonNotifications *object, GDBusMethodInvocation *invocation, guint arg_id, gpointer user_data); @@ -400,7 +400,7 @@ static GdkFilterReturn screen_xevent_filter(GdkXEvent* xevent, GdkEvent* event, return GDK_FILTER_CONTINUE; } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ static void create_screen(NotifyDaemon* daemon) { @@ -426,7 +426,7 @@ static void create_screen(NotifyDaemon* daemon) gdk_window_add_filter(gdkwindow, (GdkFilterFunc) screen_xevent_filter, daemon->screen); gdk_window_set_events(gdkwindow, gdk_window_get_events(gdkwindow) | GDK_PROPERTY_CHANGE_MASK); } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ create_stacks_for_screen(daemon, screen); } @@ -511,7 +511,7 @@ static void destroy_screen(NotifyDaemon* daemon) gdkwindow = gdk_screen_get_root_window (screen); gdk_window_remove_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter, daemon->screen); } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ for (i = 0; i < daemon->screen->n_stacks; i++) { g_clear_object (&daemon->screen->stacks[i]); @@ -536,7 +536,7 @@ static void notify_daemon_finalize(GObject* object) { gdk_window_remove_filter(NULL, (GdkFilterFunc) _notify_x11_filter, daemon); } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ if (daemon->skeleton != NULL) { @@ -759,7 +759,7 @@ static GdkFilterReturn _notify_x11_filter(GdkXEvent* xevent, GdkEvent* event, No return GDK_FILTER_CONTINUE; } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ static void _mouse_entered_cb(GtkWindow* nw, GdkEventCrossing* event, NotifyDaemon* daemon) { @@ -1293,7 +1293,7 @@ static void sync_notification_position(NotifyDaemon* daemon, GtkWindow* nw, Wind */ gtk_widget_queue_draw (GTK_WIDGET (nw)); } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ GQuark notify_daemon_error_quark(void) { @@ -1329,7 +1329,7 @@ static gboolean notify_daemon_notify_handler(NotifyDaemonNotifications *object, #ifdef HAVE_X11 Window window_xid = None; -#endif // HAVE_X11 +#endif /* HAVE_X11 */ if (g_hash_table_size (daemon->notification_hash) > MAX_NOTIFICATIONS) { @@ -1397,7 +1397,7 @@ static gboolean notify_daemon_notify_handler(NotifyDaemonNotifications *object, window_xid = (Window) g_variant_get_uint32 (data); g_variant_unref(data); } else -#endif // HAVE_X11 +#endif /* HAVE_X11 */ /* deal with x, and y hints */ if (g_variant_lookup(hints, "x", "i", &x)) { @@ -1509,7 +1509,7 @@ static gboolean notify_daemon_notify_handler(NotifyDaemonNotifications *object, */ } else -#endif // HAVE_X11 +#endif /* HAVE_X11 */ if (use_pos_data && !theme_get_always_stack (nw)) { /* @@ -1583,14 +1583,14 @@ static gboolean notify_daemon_notify_handler(NotifyDaemonNotifications *object, monitor_notification_source_windows (daemon, nt, window_xid); sync_notification_position (daemon, nw, window_xid); } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ fullscreen_window = FALSE; #ifdef HAVE_X11 if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) fullscreen_window = fullscreen_window_exists (GTK_WIDGET (nw)); -#endif // HAVE_X11 - // fullscreen_window is assumed to be false on Wayland, as there is no trivial way to check +#endif /* HAVE_X11 */ + /* fullscreen_window is assumed to be false on Wayland, as there is no trivial way to check */ /* If there is no timeout, show the notification also if screensaver * is active or there are fullscreen windows diff --git a/src/daemon/engines.c b/src/daemon/engines.c index 3a0334e..305604e 100644 --- a/src/daemon/engines.c +++ b/src/daemon/engines.c @@ -29,7 +29,7 @@ #ifdef HAVE_WAYLAND #include #include "wayland.h" -#endif // HAVE_WAYLAND +#endif /* HAVE_WAYLAND */ typedef struct { GModule* module; @@ -216,7 +216,7 @@ GtkWindow* theme_create_notification(UrlClickedCb url_clicked_cb) { wayland_init_notification (nw); } -#endif // HAVE_WAYLAND +#endif /* HAVE_WAYLAND */ return nw; } @@ -329,7 +329,7 @@ void theme_move_notification(GtkWindow* nw, int x, int y) { wayland_move_notification (nw, x, y); } -#endif // HAVE_WAYLAND +#endif /* HAVE_WAYLAND */ ThemeEngine* engine = g_object_get_data(G_OBJECT(nw), "_theme_engine"); engine->move_notification(nw, x, y); } diff --git a/src/daemon/stack.c b/src/daemon/stack.c index 35317b6..7a36d6a 100644 --- a/src/daemon/stack.c +++ b/src/daemon/stack.c @@ -30,7 +30,7 @@ #include #include #include -#endif // HAVE_X11 +#endif /* HAVE_X11 */ #define NOTIFY_STACK_SPACING 2 #define WORKAREA_PADDING 6 @@ -115,7 +115,7 @@ get_work_area (NotifyStack *stack, return TRUE; } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ static void get_origin_coordinates (NotifyStackLocation stack_location, @@ -304,7 +304,7 @@ notify_stack_shift_notifications (NotifyStack *stack, } else #endif - { // Not using X11 + { /* Not using X11 */ workarea = monitor; } diff --git a/src/daemon/wayland.h b/src/daemon/wayland.h index 5a58ec9..3779f5f 100644 --- a/src/daemon/wayland.h +++ b/src/daemon/wayland.h @@ -21,7 +21,7 @@ #ifndef _WAYLAND_H #define _WAYLAND_H -#ifdef PACKAGE_NAME // only check HAVE_WAYLAND if config.h has been included +#ifdef PACKAGE_NAME /* only check HAVE_WAYLAND if config.h has been included */ #ifndef HAVE_WAYLAND #error file should only be included when HAVE_WAYLAND is enabled #endif -- cgit v1.2.1