From 34c561894bfedab242876fea249ab8596a61e8a4 Mon Sep 17 00:00:00 2001 From: rbuj Date: Sat, 20 Jun 2020 14:56:13 +0200 Subject: Avoid using single-line cpp comments --- libmate-panel-applet/mate-panel-applet-factory.c | 2 +- libmate-panel-applet/mate-panel-applet.c | 26 ++++++++++++------------ libmate-panel-applet/mate-panel-applet.h | 2 +- libmate-panel-applet/panel-applet-private.h | 2 +- libmate-panel-applet/panel-plug-private.h | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'libmate-panel-applet') diff --git a/libmate-panel-applet/mate-panel-applet-factory.c b/libmate-panel-applet/mate-panel-applet-factory.c index 6d51cae3..c9a331a6 100644 --- a/libmate-panel-applet/mate-panel-applet-factory.c +++ b/libmate-panel-applet/mate-panel-applet-factory.c @@ -226,7 +226,7 @@ mate_panel_applet_factory_get_applet (MatePanelAppletFactory *factory, xid = mate_panel_applet_get_xid (MATE_PANEL_APPLET (applet), screen); } else #endif - { // Not using X11 + { /* Not using X11 */ xid = 0; } diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c index adb1d467..c19ffb3a 100644 --- a/libmate-panel-applet/mate-panel-applet.c +++ b/libmate-panel-applet/mate-panel-applet.c @@ -535,7 +535,7 @@ mate_panel_applet_find_toplevel_dock_window (MatePanelApplet *applet, return None; } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ /* This function * 1) Gets the window id of the panel that contains the applet @@ -1064,13 +1064,13 @@ mate_panel_applet_get_preferred_height (GtkWidget *widget, static GtkSizeRequestMode mate_panel_applet_get_request_mode (GtkWidget *widget) { - /*Do not use GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH - *or GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT - *to avoid problems with in-process applets - *when the panel is not expanded - *See https://github.com/mate-desktop/mate-panel/issues/797 - *and https://github.com/mate-desktop/mate-panel/issues/799 - *Out of process applets already use GTK_SIZE_REQUEST_CONSTANT_SIZE + /* Do not use GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH + * or GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT + * to avoid problems with in-process applets + * when the panel is not expanded + * See https://github.com/mate-desktop/mate-panel/issues/797 + * and https://github.com/mate-desktop/mate-panel/issues/799 + * Out of process applets already use GTK_SIZE_REQUEST_CONSTANT_SIZE */ return GTK_SIZE_REQUEST_CONSTANT_SIZE; } @@ -1400,7 +1400,7 @@ mate_panel_applet_handle_background_string (MatePanelApplet *applet, retval = PANEL_PIXMAP_BACKGROUND; } else #endif - { // not using X11 + { /* not using X11 */ g_warning("Received pixmap background type, which is only supported on X11"); } } else @@ -1779,7 +1779,7 @@ static void _mate_panel_applet_prepare_css (GtkStyleContext *context) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); g_object_unref (provider); } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ static void mate_panel_applet_init (MatePanelApplet *applet) @@ -1850,7 +1850,7 @@ mate_panel_applet_constructor (GType type, gtk_container_add (GTK_CONTAINER (applet->priv->plug), GTK_WIDGET (applet)); } else #endif - { // not using X11 + { /* not using X11 */ g_warning ("Requested construction of an out-of-process applet, which is only possible on X11"); } @@ -2325,7 +2325,7 @@ _mate_panel_applet_factory_main_internal (const gchar *factory_id, _mate_panel_applet_setup_x_error_handler(); } else #endif - { // not using X11 + { /* not using X11 */ if (out_process) { g_warning("Requested out-of-process applet, which is only supported on X11"); return 1; @@ -2414,7 +2414,7 @@ guint32 mate_panel_applet_get_xid (MatePanelApplet *applet, GdkScreen *screen) { - // out_of_process should only be true on X11, so an extra runtime Wayland check is not needed + /* out_of_process should only be true on X11, so an extra runtime Wayland check is not needed */ if (applet->priv->out_of_process == FALSE) return 0; diff --git a/libmate-panel-applet/mate-panel-applet.h b/libmate-panel-applet/mate-panel-applet.h index d146c939..4f1b4cf5 100644 --- a/libmate-panel-applet/mate-panel-applet.h +++ b/libmate-panel-applet/mate-panel-applet.h @@ -107,7 +107,7 @@ void mate_panel_applet_set_size_hints(MatePanelApplet* applet, const int* size_h gboolean mate_panel_applet_get_locked_down(MatePanelApplet* applet); -// Does nothing when not on X11 +/* Does nothing when not on X11 */ void mate_panel_applet_request_focus(MatePanelApplet* applet, guint32 timestamp); void mate_panel_applet_setup_menu(MatePanelApplet* applet, const gchar* xml, GtkActionGroup* action_group); diff --git a/libmate-panel-applet/panel-applet-private.h b/libmate-panel-applet/panel-applet-private.h index 3d6fdf7b..ea1dd6c2 100644 --- a/libmate-panel-applet/panel-applet-private.h +++ b/libmate-panel-applet/panel-applet-private.h @@ -25,7 +25,7 @@ G_BEGIN_DECLS -// Returns 0 when not on X11 +/* Returns 0 when not on X11 */ guint32 mate_panel_applet_get_xid (MatePanelApplet *applet, GdkScreen *screen); const gchar *mate_panel_applet_get_object_path (MatePanelApplet *applet); diff --git a/libmate-panel-applet/panel-plug-private.h b/libmate-panel-applet/panel-plug-private.h index 82e0ac05..5d5f1265 100644 --- a/libmate-panel-applet/panel-plug-private.h +++ b/libmate-panel-applet/panel-plug-private.h @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -// File should only be used on X11 +/* File should only be used on X11 */ #ifndef PANEL_PLUG_PRIVATE_H #define PANEL_PLUG_PRIVATE_H -#ifdef PACKAGE_NAME // only check HAVE_X11 if config.h has been included +#ifdef PACKAGE_NAME /* only check HAVE_X11 if config.h has been included */ #ifndef HAVE_X11 #error file should only be included when HAVE_X11 is enabled #endif -- cgit v1.2.1