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 --- mate-panel/applet.c | 6 ++-- mate-panel/button-widget.c | 6 ++-- mate-panel/drawer.c | 2 +- mate-panel/launcher.c | 2 +- .../panel-applet-container.c | 8 +++--- .../panel-applets-manager-dbus.c | 2 +- mate-panel/libpanel-util/panel-icon-chooser.c | 5 ++-- mate-panel/libpanel-util/panel-keyfile.c | 4 +-- mate-panel/libpanel-util/panel-launch.c | 6 ++-- mate-panel/menu.c | 5 ++-- mate-panel/panel-action-button.c | 2 +- mate-panel/panel-action-protocol.h | 2 +- mate-panel/panel-addto.c | 2 +- mate-panel/panel-applet-frame.c | 2 +- mate-panel/panel-background-monitor.h | 2 +- mate-panel/panel-background.c | 27 +++++++++--------- mate-panel/panel-background.h | 2 +- mate-panel/panel-context-menu.c | 2 +- mate-panel/panel-ditem-editor.c | 2 +- mate-panel/panel-force-quit.h | 2 +- mate-panel/panel-layout.c | 2 +- mate-panel/panel-menu-bar.c | 2 +- mate-panel/panel-menu-items.c | 9 +++--- mate-panel/panel-multimonitor.c | 32 ++++++++++++---------- mate-panel/panel-profile.c | 2 +- mate-panel/panel-properties-dialog.c | 2 +- mate-panel/panel-recent.c | 6 ++-- mate-panel/panel-run-dialog.c | 11 ++++---- mate-panel/panel-struts.h | 2 +- mate-panel/panel-test-applets.c | 4 +-- mate-panel/panel-toplevel.c | 32 +++++++++++----------- mate-panel/panel-util.c | 2 +- mate-panel/panel-widget.c | 4 +-- mate-panel/panel-xutils.h | 2 +- mate-panel/xstuff.h | 2 +- 35 files changed, 107 insertions(+), 98 deletions(-) (limited to 'mate-panel') diff --git a/mate-panel/applet.c b/mate-panel/applet.c index b217932a..5df797be 100644 --- a/mate-panel/applet.c +++ b/mate-panel/applet.c @@ -1142,9 +1142,9 @@ mate_panel_applet_save_position (AppletInfo *applet_info, g_settings_set_boolean (applet_info->settings, PANEL_OBJECT_LOCKED_KEY, locked); if (locked) { - // Until position calculations are refactored to fix the issue of the panel applets - // getting reordered on resolution changes... - // .. don't save position/right-stick on locked applets + /* Until position calculations are refactored to fix the issue of the panel applets + getting reordered on resolution changes... + .. don't save position/right-stick on locked applets */ return; } diff --git a/mate-panel/button-widget.c b/mate-panel/button-widget.c index 35427a0f..cb2a4104 100644 --- a/mate-panel/button-widget.c +++ b/mate-panel/button-widget.c @@ -180,7 +180,7 @@ button_widget_reload_surface (ButtonWidget *button) (button->priv->orientation & PANEL_HORIZONTAL_MASK) ? button->priv->size * scale: -1, &error); if (error) { - //FIXME: this is not rendered at button->priv->size + /* FIXME: this is not rendered at button->priv->size */ GtkIconTheme *icon_theme = gtk_icon_theme_get_default(); button->priv->surface = gtk_icon_theme_load_surface (icon_theme, "image-missing", @@ -317,7 +317,7 @@ calc_arrow (PanelOrientation orientation, switch (orientation) { case PANEL_ORIENTATION_TOP: *x = (button_width - (*size)) / 2; - *y = button_height * .99 - (*size) / (3/2); // 3/2 is the approximate ratio of GTK arrows + *y = button_height * .99 - (*size) / (3/2); /* 3/2 is the approximate ratio of GTK arrows */ *angle = G_PI; retval = GTK_ARROW_DOWN; break; @@ -328,7 +328,7 @@ calc_arrow (PanelOrientation orientation, retval = GTK_ARROW_UP; break; case PANEL_ORIENTATION_LEFT: - *x = button_width * .99 - (*size) / (3/2); // 3/2 is the approximate ratio of GTK arrows + *x = button_width * .99 - (*size) / (3/2); /* 3/2 is the approximate ratio of GTK arrows */ *y = (button_height - (*size)) / 2; *angle = G_PI / 2; retval = GTK_ARROW_RIGHT; diff --git a/mate-panel/drawer.c b/mate-panel/drawer.c index 5e637cc4..40251bf1 100644 --- a/mate-panel/drawer.c +++ b/mate-panel/drawer.c @@ -715,7 +715,7 @@ panel_drawer_set_dnd_enabled (Drawer *drawer, GDK_BUTTON1_MASK, dnd_targets, 1, GDK_ACTION_MOVE); - //FIXME: we're forgetting the use_custom_icon case, here + /* FIXME: we're forgetting the use_custom_icon case, here */ gtk_drag_source_set_icon_name (drawer->button, button_widget_get_icon_name (BUTTON_WIDGET (drawer->button))); gtk_widget_set_has_window (drawer->button, FALSE); diff --git a/mate-panel/launcher.c b/mate-panel/launcher.c index ebbe31f7..a6ef4be0 100644 --- a/mate-panel/launcher.c +++ b/mate-panel/launcher.c @@ -183,7 +183,7 @@ drag_data_received_cb (GtkWidget *widget, int i; GList *file_list; - // The animation uses X specific functionality + /* The animation uses X specific functionality */ #ifdef HAVE_X11 if (is_using_x11 () && panel_global_config_get_enable_animations ()) { cairo_surface_t *surface; diff --git a/mate-panel/libmate-panel-applet-private/panel-applet-container.c b/mate-panel/libmate-panel-applet-private/panel-applet-container.c index f6e0f94c..9354b999 100644 --- a/mate-panel/libmate-panel-applet-private/panel-applet-container.c +++ b/mate-panel/libmate-panel-applet-private/panel-applet-container.c @@ -118,7 +118,7 @@ panel_applet_container_setup (MatePanelAppletContainer *container) gtk_widget_show (container->priv->socket); } else #endif - { // Not using X11 + { /* Not using X11 */ g_warning("%s requested out-of-process container, which is only supported on X11", container->priv->iid); } @@ -295,7 +295,7 @@ mate_panel_applet_container_plug_removed (MatePanelAppletContainer *container) */ return FALSE; } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ static void mate_panel_applet_container_child_signal (GDBusProxy *proxy, @@ -389,7 +389,7 @@ on_proxy_appeared (GObject *source_object, panel_applet_container_setup (container); #ifdef HAVE_X11 - // xid always <= 0 when not using X11 + /* xid always <= 0 when not using X11 */ if (container->priv->xid > 0) { gtk_socket_add_id (GTK_SOCKET (container->priv->socket), container->priv->xid); @@ -533,7 +533,7 @@ mate_panel_applet_container_get_applet (MatePanelAppletContainer *container, screen_number = gdk_x11_screen_get_screen_number (screen); } else #endif - { // Not using X11 + { /* Not using X11 */ screen_number = 0; } diff --git a/mate-panel/libmate-panel-applet-private/panel-applets-manager-dbus.c b/mate-panel/libmate-panel-applet-private/panel-applets-manager-dbus.c index 82c1e918..4ee9296b 100644 --- a/mate-panel/libmate-panel-applet-private/panel-applets-manager-dbus.c +++ b/mate-panel/libmate-panel-applet-private/panel-applets-manager-dbus.c @@ -118,7 +118,7 @@ _mate_panel_applets_manager_get_applet_info (GKeyFile *applet_file, supported_platforms = g_key_file_get_string_list (applet_file, group, "Platforms", NULL, NULL); if (supported_platforms == NULL) { - // If supported platforms are not specified, assume all are supported + /* If supported platforms are not specified, assume all are supported */ x11_supported = TRUE; wayland_supported = TRUE; } else { diff --git a/mate-panel/libpanel-util/panel-icon-chooser.c b/mate-panel/libpanel-util/panel-icon-chooser.c index 5c328db8..44d64908 100644 --- a/mate-panel/libpanel-util/panel-icon-chooser.c +++ b/mate-panel/libpanel-util/panel-icon-chooser.c @@ -429,8 +429,9 @@ _panel_icon_chooser_clicked (GtkButton *button) if (!filechooser_path_set) { char *path; - // FIXME? Use current icon theme? But there might not be a lot - // of icons there... + /* FIXME? Use current icon theme? But there might not be a lot + * of icons there... + */ path = g_build_filename (DATADIR, "icons", NULL); gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (filechooser), path); diff --git a/mate-panel/libpanel-util/panel-keyfile.c b/mate-panel/libpanel-util/panel-keyfile.c index 181d1cff..e7745501 100644 --- a/mate-panel/libpanel-util/panel-keyfile.c +++ b/mate-panel/libpanel-util/panel-keyfile.c @@ -41,7 +41,7 @@ panel_key_file_new_desktop (void) retval = g_key_file_new (); - //FIXME? g_key_file_set_string (retval, G_KEY_FILE_DESKTOP_GROUP, "Name", _("No Name")); + /* FIXME? g_key_file_set_string (retval, G_KEY_FILE_DESKTOP_GROUP, "Name", _("No Name")); */ g_key_file_set_string (retval, G_KEY_FILE_DESKTOP_GROUP, "Version", "1.0"); return retval; @@ -87,7 +87,7 @@ _panel_key_file_make_executable (const gchar *path) g_object_unref (file); } -//FIXME: kill this when bug #309224 is fixed +/* FIXME: kill this when bug #309224 is fixed */ gboolean panel_key_file_to_file (GKeyFile *keyfile, const gchar *file, diff --git a/mate-panel/libpanel-util/panel-launch.c b/mate-panel/libpanel-util/panel-launch.c index 66632dc9..7de0a02c 100644 --- a/mate-panel/libpanel-util/panel-launch.c +++ b/mate-panel/libpanel-util/panel-launch.c @@ -81,9 +81,9 @@ dummy_child_watch (GPid pid, gpointer user_data) { /* Nothing, this is just to ensure we don't double fork - * and break pkexec: - * https://bugzilla.gnome.org/show_bug.cgi?id=675789 - */ + * and break pkexec: + * https://bugzilla.gnome.org/show_bug.cgi?id=675789 + */ } static void diff --git a/mate-panel/menu.c b/mate-panel/menu.c index 6376e964..4b8c5343 100644 --- a/mate-panel/menu.c +++ b/mate-panel/menu.c @@ -1059,8 +1059,9 @@ create_menuitem (GtkWidget *menu, (GDestroyNotify) matemenu_tree_item_unref); if (alias_directory) { - //FIXME: we should probably use this data when we do dnd or - //context menu for this menu item + /* FIXME: we should probably use this data when we do dnd or + * context menu for this menu item + */ g_object_set_data_full (G_OBJECT (menuitem), "panel-menu-tree-alias-directory", matemenu_tree_item_ref (alias_directory), diff --git a/mate-panel/panel-action-button.c b/mate-panel/panel-action-button.c index 99b74dd4..a24b2f91 100644 --- a/mate-panel/panel-action-button.c +++ b/mate-panel/panel-action-button.c @@ -413,7 +413,7 @@ static PanelAction actions [] = { }, { PANEL_ACTION_CONNECT_SERVER, - PANEL_ICON_REMOTE, //FIXME icon + PANEL_ICON_REMOTE, /* FIXME icon */ N_("Connect to Server..."), N_("Connect to a remote computer or shared disk"), "caja-server-connect", diff --git a/mate-panel/panel-action-protocol.h b/mate-panel/panel-action-protocol.h index 3d27a124..4774826b 100644 --- a/mate-panel/panel-action-protocol.h +++ b/mate-panel/panel-action-protocol.h @@ -25,7 +25,7 @@ #ifndef __PANEL_ACTION_PROTOCOL_H__ #define __PANEL_ACTION_PROTOCOL_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 diff --git a/mate-panel/panel-addto.c b/mate-panel/panel-addto.c index 8a30c1b1..d489509f 100644 --- a/mate-panel/panel-addto.c +++ b/mate-panel/panel-addto.c @@ -1397,7 +1397,7 @@ panel_addto_dialog_new (PanelWidget *panel_widget) "sensitive", COLUMN_ENABLED, NULL); - //FIXME use the same search than the one for the search entry? + /* FIXME use the same search than the one for the search entry? */ gtk_tree_view_set_search_column (GTK_TREE_VIEW (dialog->tree_view), COLUMN_SEARCH); diff --git a/mate-panel/panel-applet-frame.c b/mate-panel/panel-applet-frame.c index a31f26a4..a3aa92e6 100644 --- a/mate-panel/panel-applet-frame.c +++ b/mate-panel/panel-applet-frame.c @@ -805,7 +805,7 @@ _mate_panel_applet_frame_applet_broken (MatePanelAppletFrame *frame) gdk_x11_get_server_time (gtk_widget_get_window (GTK_WIDGET (dialog)))); else #endif - { // Not using X11 + { /* Not using X11 */ gtk_window_present(GTK_WINDOW (dialog)); } diff --git a/mate-panel/panel-background-monitor.h b/mate-panel/panel-background-monitor.h index 56140bc9..09b7b91e 100644 --- a/mate-panel/panel-background-monitor.h +++ b/mate-panel/panel-background-monitor.h @@ -27,7 +27,7 @@ #ifndef __PANEL_BACKGROUND_MONITOR_H__ #define __PANEL_BACKGROUND_MONITOR_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 diff --git a/mate-panel/panel-background.c b/mate-panel/panel-background.c index 89ffc592..9b503209 100644 --- a/mate-panel/panel-background.c +++ b/mate-panel/panel-background.c @@ -151,8 +151,8 @@ panel_background_prepare (PanelBackground *background) !gdk_window_check_composited_wm(background->window)) set_pixbuf_background (background); else -#endif // HAVE_X11 - { // Not using X11, or pixbuf background not needed +#endif /* HAVE_X11 */ + { /* Not using X11, or pixbuf background not needed */ gdk_window_set_background_rgba (background->window, &background->color); } @@ -258,7 +258,7 @@ get_desktop_pixbuf (PanelBackground *background) return desktop; } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ static cairo_pattern_t * composite_image_onto_desktop (PanelBackground *background) @@ -297,7 +297,7 @@ composite_image_onto_desktop (PanelBackground *background) } } } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ gdk_cairo_set_source_pixbuf (cr, background->transformed_image, 0, 0); pattern = cairo_get_source (cr); @@ -343,7 +343,7 @@ composite_color_onto_desktop (PanelBackground *background) } } } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ gdk_cairo_set_source_rgba (cr, &background->color); cairo_paint (cr); @@ -587,7 +587,7 @@ disconnect_background_monitor (PanelBackground *background) g_object_unref (background->desktop); background->desktop = NULL; } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ static void panel_background_update_has_alpha (PanelBackground *background) @@ -608,7 +608,7 @@ panel_background_update_has_alpha (PanelBackground *background) if (!has_alpha) disconnect_background_monitor (background); } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ } static void @@ -619,8 +619,9 @@ load_background_file (PanelBackground *background) if (!g_file_test (background->image, G_FILE_TEST_IS_REGULAR)) return; - //FIXME add a monitor on the file so that we reload the background - //when it changes + /* FIXME add a monitor on the file so that we reload the background + * when it changes + */ background->loaded_image = gdk_pixbuf_new_from_file (background->image, &error); if (!background->loaded_image) { @@ -908,7 +909,7 @@ panel_background_change_region (PanelBackground *background, if (background->desktop) g_object_unref (background->desktop); background->desktop = NULL; -#endif // HAVE_X11 +#endif /* HAVE_X11 */ if (need_to_retransform || ! background->transformed) /* only retransform the background if we have in @@ -953,7 +954,7 @@ panel_background_init (PanelBackground *background, background->monitor = NULL; background->desktop = NULL; background->monitor_signal = -1; -#endif // HAVE_X11 +#endif /* HAVE_X11 */ background->window = NULL; @@ -981,7 +982,7 @@ panel_background_free (PanelBackground *background) if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) { disconnect_background_monitor (background); } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ free_transformed_resources (background); @@ -997,7 +998,7 @@ panel_background_free (PanelBackground *background) if (background->monitor) g_object_unref (background->monitor); background->monitor = NULL; -#endif // HAVE_X11 +#endif /* HAVE_X11 */ if (background->window) g_object_unref (background->window); diff --git a/mate-panel/panel-background.h b/mate-panel/panel-background.h index 7d92078a..fbfbd5d9 100644 --- a/mate-panel/panel-background.h +++ b/mate-panel/panel-background.h @@ -63,7 +63,7 @@ struct _PanelBackground { PanelBackgroundMonitor *monitor; GdkPixbuf *desktop; gulong monitor_signal; -#endif // HAVE_X11 +#endif /* HAVE_X11 */ GdkWindow *window; cairo_pattern_t *default_pattern; diff --git a/mate-panel/panel-context-menu.c b/mate-panel/panel-context-menu.c index 0bae952b..c09b9ac6 100644 --- a/mate-panel/panel-context-menu.c +++ b/mate-panel/panel-context-menu.c @@ -330,7 +330,7 @@ panel_context_menu_create (PanelWidget *panel) G_CALLBACK (panel_context_menu_show_about_dialog), NULL); - //FIXME: can we get rid of this? (needed by menu_get_panel()) + /* FIXME: can we get rid of this? (needed by menu_get_panel()) */ g_object_set_data (G_OBJECT (retval), "menu_panel", panel); /* Set up theme and transparency support */ diff --git a/mate-panel/panel-ditem-editor.c b/mate-panel/panel-ditem-editor.c index 05a0f1e1..80a0418b 100644 --- a/mate-panel/panel-ditem-editor.c +++ b/mate-panel/panel-ditem-editor.c @@ -250,7 +250,7 @@ panel_ditem_editor_constructor (GType type, if (!loaded && dialog->priv->uri) { file = g_file_new_for_uri (dialog->priv->uri); if (g_file_query_exists (file, NULL)) { - //FIXME what if there's an error? + /* FIXME what if there's an error? */ panel_ditem_editor_load_uri (dialog, NULL); dialog->priv->new_file = FALSE; } else { diff --git a/mate-panel/panel-force-quit.h b/mate-panel/panel-force-quit.h index 4f7d5851..7f67dc76 100644 --- a/mate-panel/panel-force-quit.h +++ b/mate-panel/panel-force-quit.h @@ -25,7 +25,7 @@ #ifndef __PANEL_FORCE_QUIT_H__ #define __PANEL_FORCE_QUIT_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 diff --git a/mate-panel/panel-layout.c b/mate-panel/panel-layout.c index 56ad2127..88de06aa 100644 --- a/mate-panel/panel-layout.c +++ b/mate-panel/panel-layout.c @@ -333,7 +333,7 @@ panel_layout_apply_default_from_gkeyfile (GdkScreen *screen) #ifdef HAVE_X11 if (GDK_IS_X11_SCREEN (screen)) screen_n = gdk_x11_screen_get_screen_number (screen); -#endif // HAVE_11 +#endif /* HAVE_11 */ layout_file = panel_layout_filename(); diff --git a/mate-panel/panel-menu-bar.c b/mate-panel/panel-menu-bar.c index ae429ba8..8a69ddca 100644 --- a/mate-panel/panel-menu-bar.c +++ b/mate-panel/panel-menu-bar.c @@ -98,7 +98,7 @@ static void panel_menu_bar_setup_tooltip(PanelMenuBar* menubar) panel_util_set_tooltip_text(menubar->priv->places_item, _("Access documents, folders and network places")); panel_util_set_tooltip_text(menubar->priv->desktop_item, _("Change desktop appearance and behavior, get help, or log out")); - //FIXME: this doesn't handle the right-click case. Sigh. + /* FIXME: this doesn't handle the right-click case. Sigh. */ /* Hide tooltip if a menu is activated */ g_signal_connect(menubar->priv->applications_item, "activate", G_CALLBACK (panel_menu_bar_hide_tooltip_and_focus), menubar); g_signal_connect(menubar->priv->places_item, "activate", G_CALLBACK (panel_menu_bar_hide_tooltip_and_focus), menubar); diff --git a/mate-panel/panel-menu-items.c b/mate-panel/panel-menu-items.c index e433d2ed..4885f1e8 100644 --- a/mate-panel/panel-menu-items.c +++ b/mate-panel/panel-menu-items.c @@ -519,7 +519,7 @@ panel_place_menu_item_append_gtk_bookmarks (GtkWidget *menu, guint max_items_or_ gicon = g_themed_icon_new_with_default_fallbacks (icon); - //FIXME: drag and drop will be broken for x-caja-search uris + /* FIXME: drag and drop will be broken for x-caja-search uris */ panel_menu_items_append_place_item (icon, gicon, label, tooltip, @@ -568,8 +568,9 @@ drive_poll_for_media_cb (GObject *source_object, g_error_free (error); } - //FIXME: should we mount the volume and activate the root of the new - //mount? + /* FIXME: should we mount the volume and activate the root of the new + * mount? + */ } static void @@ -735,7 +736,7 @@ panel_menu_item_append_mount (GtkWidget *menu, panel_menu_items_append_place_item (NULL, icon, display_name, - display_name, //FIXME tooltip + display_name, /* FIXME tooltip */ menu, G_CALLBACK (activate_uri), activation_uri); diff --git a/mate-panel/panel-multimonitor.c b/mate-panel/panel-multimonitor.c index 5d8c63ef..8b4e7c62 100644 --- a/mate-panel/panel-multimonitor.c +++ b/mate-panel/panel-multimonitor.c @@ -30,19 +30,23 @@ #include #include #include -#endif // HAVE_X11 +#endif /* HAVE_X11 */ #include "panel-multimonitor.h" #include -// The number of logical monitors we are keeping track of -// May be different than gdk_display_get_n_monitors() -// (see comment in panel_multimonitor_compress_overlapping_monitors for details) +/* + * The number of logical monitors we are keeping track of + * May be different than gdk_display_get_n_monitors() + * (see comment in panel_multimonitor_compress_overlapping_monitors for details) + */ static int monitor_count = 0; -// A dynamically allocated array of monitor geometries -// monitor_count is the length +/* + * A dynamically allocated array of monitor geometries + * monitor_count is the length + */ static GdkRectangle *geometries = NULL; static gboolean initialized = FALSE; @@ -209,8 +213,8 @@ panel_multimonitor_get_randr_monitors (int *monitors_ret, return TRUE; } -#endif // HAVE_RANDR -#endif // HAVE_X11 +#endif /* HAVE_RANDR */ +#endif /* HAVE_X11 */ static void panel_multimonitor_get_gdk_monitors (int *monitors_ret, @@ -245,8 +249,8 @@ panel_multimonitor_get_raw_monitors (int *monitors_ret, #ifdef HAVE_RANDR if (GDK_IS_X11_DISPLAY (gdk_display_get_default ()) && have_randr) res = panel_multimonitor_get_randr_monitors (monitors_ret, geometries_ret); -#endif // HAVE_RANDR -#endif // HAVE_X11 +#endif /* HAVE_RANDR */ +#endif /* HAVE_X11 */ if (res && *monitors_ret > 0) return; @@ -429,8 +433,8 @@ panel_multimonitor_init_randr (GdkDisplay *display) have_randr = TRUE; } } -#endif // HAVE_RANDR -#endif // HAVE_X11 +#endif /* HAVE_RANDR */ +#endif /* HAVE_X11 */ void panel_multimonitor_init (void) @@ -451,8 +455,8 @@ panel_multimonitor_init (void) #ifdef HAVE_RANDR if (GDK_IS_X11_DISPLAY (display)) panel_multimonitor_init_randr (display); -#endif // HAVE_RANDR -#endif // HAVE_X11 +#endif /* HAVE_RANDR */ +#endif /* HAVE_X11 */ /* * The screen signals probably shouldn't be needed, but sometimes on X11 they are diff --git a/mate-panel/panel-profile.c b/mate-panel/panel-profile.c index b976306e..ccc58b84 100644 --- a/mate-panel/panel-profile.c +++ b/mate-panel/panel-profile.c @@ -986,7 +986,7 @@ panel_profile_create_toplevel (GdkScreen *screen) if (GDK_IS_X11_SCREEN (screen)) { screen_number = gdk_x11_screen_get_screen_number (screen); } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ g_settings_set_int (settings, PANEL_TOPLEVEL_SCREEN_KEY, screen_number); diff --git a/mate-panel/panel-properties-dialog.c b/mate-panel/panel-properties-dialog.c index f71c126a..ad0389e9 100644 --- a/mate-panel/panel-properties-dialog.c +++ b/mate-panel/panel-properties-dialog.c @@ -603,7 +603,7 @@ panel_properties_dialog_update_orientation (PanelPropertiesDialog *dialog, int profile_size; /* change the maximum size of the panel */ - //TODO: we should also do this when the monitor size changes + /* TODO: we should also do this when the monitor size changes */ max_size = panel_toplevel_get_maximum_size (dialog->toplevel); spin_size = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (dialog->size_spin)); profile_size = panel_profile_get_toplevel_size (dialog->toplevel); diff --git a/mate-panel/panel-recent.c b/mate-panel/panel-recent.c index 3795b12b..5f39584b 100644 --- a/mate-panel/panel-recent.c +++ b/mate-panel/panel-recent.c @@ -65,13 +65,13 @@ recent_documents_activate_cb (GtkRecentChooser *chooser, recent_info = gtk_recent_chooser_get_current_item (chooser); uri = gtk_recent_info_get_uri (recent_info); mime_type = gtk_recent_info_get_mime_type (recent_info); - //FIXME gtk_recent_info_get_application_info() could be useful + /* FIXME gtk_recent_info_get_application_info() could be useful */ if (show_uri (uri, mime_type, screen, &error) != TRUE) { char *uri_utf8; uri_utf8 = g_filename_to_utf8 (uri, -1, NULL, NULL, NULL); - //FIXME this could fail... Maybe we want gtk_recent_info_get_display_name() + /* FIXME this could fail... Maybe we want gtk_recent_info_get_display_name() */ if (error) { char *primary; @@ -218,7 +218,7 @@ panel_recent_append_documents_menu (GtkWidget *top_menu, G_CALLBACK (recent_documents_activate_cb), NULL); - //FIXME this is not possible with GtkRecent...: egg_recent_view_gtk_set_icon_size (view, panel_menu_icon_get_size ()); + /* FIXME this is not possible with GtkRecent...: egg_recent_view_gtk_set_icon_size (view, panel_menu_icon_get_size ()); */ g_signal_connect_object (manager, "changed", G_CALLBACK (panel_recent_manager_changed_cb), diff --git a/mate-panel/panel-run-dialog.c b/mate-panel/panel-run-dialog.c index e632acd6..f6fa95b8 100644 --- a/mate-panel/panel-run-dialog.c +++ b/mate-panel/panel-run-dialog.c @@ -308,8 +308,9 @@ panel_run_dialog_set_icon (PanelRunDialog *dialog, */ gtk_image_set_from_pixbuf (GTK_IMAGE (dialog->pixmap), pixbuf); - //FIXME: it'd be better to set an icon of the correct size, - //(ditto for the drag icon?) + /* FIXME: it'd be better to set an icon of the correct size, + * (ditto for the drag icon?) + */ gtk_window_set_icon (GTK_WINDOW (dialog->run_dialog), pixbuf); gtk_drag_source_set_icon_gicon (dialog->run_dialog, dialog->icon); @@ -743,7 +744,7 @@ panel_run_dialog_find_command_idle (PanelRunDialog *dialog) gtk_tree_path_free (path); panel_run_dialog_set_icon (dialog, found_icon, FALSE); - //FIXME update dialog->program_label + /* FIXME update dialog->program_label */ g_clear_object (&found_icon); g_free (text); @@ -933,7 +934,7 @@ panel_run_dialog_add_items_idle (PanelRunDialog *dialog) gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->program_list), model_filter); - //FIXME use the same search than the fuzzy one? + /* FIXME use the same search than the fuzzy one? */ gtk_tree_view_set_search_column (GTK_TREE_VIEW (dialog->program_list), COLUMN_NAME); @@ -1068,7 +1069,7 @@ program_list_selection_changed (GtkTreeSelection *selection, g_free (temp); temp = panel_key_file_get_locale_string (key_file, "Comment"); - //FIXME: if sure_string () == "", we should display "Will run..." as in entry_changed() + /* FIXME: if sure_string () == "", we should display "Will run..." as in entry_changed() */ gtk_label_set_text (GTK_LABEL (dialog->program_label), sure_string (temp)); g_free (temp); diff --git a/mate-panel/panel-struts.h b/mate-panel/panel-struts.h index 7897f532..01003ec2 100644 --- a/mate-panel/panel-struts.h +++ b/mate-panel/panel-struts.h @@ -23,7 +23,7 @@ #ifndef __PANEL_STRUTS_H__ #define __PANEL_STRUTS_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 diff --git a/mate-panel/panel-test-applets.c b/mate-panel/panel-test-applets.c index 34790dbf..83f27ca7 100644 --- a/mate-panel/panel-test-applets.c +++ b/mate-panel/panel-test-applets.c @@ -128,7 +128,7 @@ applet_activated_cb (GObject *source_object, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Failed to load applet %s"), - error->message); // FIXME + error->message); /* FIXME */ gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); return; @@ -150,7 +150,7 @@ load_applet_into_window (const char *title, container = mate_panel_applet_container_new (); applet_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - //FIXME: we could set the window icon with the applet icon + /* FIXME: we could set the window icon with the applet icon */ gtk_window_set_title (GTK_WINDOW (applet_window), title); gtk_container_add (GTK_CONTAINER (applet_window), container); gtk_widget_show (container); diff --git a/mate-panel/panel-toplevel.c b/mate-panel/panel-toplevel.c index 747d6935..d2642aa2 100644 --- a/mate-panel/panel-toplevel.c +++ b/mate-panel/panel-toplevel.c @@ -450,7 +450,7 @@ static void panel_toplevel_warp_pointer(PanelToplevel* toplevel) panel_warp_pointer (gtk_widget_get_window (widget), x, y); } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ static void panel_toplevel_begin_attached_move(PanelToplevel* toplevel, gboolean is_keyboard, guint32 time_) { @@ -524,7 +524,7 @@ static void panel_toplevel_begin_grab_op(PanelToplevel* toplevel, PanelGrabOpTyp toplevel->priv->grab_is_keyboard) { panel_toplevel_warp_pointer (toplevel); } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ cursor_type = panel_toplevel_grab_op_cursor ( toplevel, toplevel->priv->grab_op); @@ -909,7 +909,7 @@ static gboolean panel_toplevel_move_keyboard_floating(PanelToplevel* toplevel, G #undef NORMAL_INCREMENT } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ static gboolean panel_toplevel_move_keyboard_expanded(PanelToplevel* toplevel, GdkEventKey* event) { @@ -1006,7 +1006,7 @@ static gboolean panel_toplevel_handle_grab_op_key_event(PanelToplevel* toplevel, retval = panel_toplevel_move_keyboard_floating ( toplevel, event); } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ break; case PANEL_GRAB_OP_RESIZE: retval = panel_toplevel_initial_resize_keypress (toplevel, event); @@ -1018,7 +1018,7 @@ static gboolean panel_toplevel_handle_grab_op_key_event(PanelToplevel* toplevel, #ifdef HAVE_X11 if (GDK_IS_X11_DISPLAY (gtk_widget_get_display (GTK_WIDGET (toplevel)))) retval = panel_toplevel_warp_pointer_increment (toplevel, event->keyval, 1); -#endif // HAVE_X11 +#endif /* HAVE_X11 */ break; default: g_assert_not_reached (); @@ -1452,7 +1452,7 @@ static gboolean panel_toplevel_update_struts(PanelToplevel* toplevel, gboolean e panel_struts_set_window_hint (toplevel); return FALSE; } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ /* In the case of the initial animation, we really want the struts to * represent what is at the end of the animation, to avoid desktop @@ -1559,13 +1559,13 @@ static gboolean panel_toplevel_update_struts(PanelToplevel* toplevel, gboolean e else panel_struts_unset_window_hint (toplevel); } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ #ifdef HAVE_WAYLAND if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (GTK_WIDGET (toplevel)))) { wayland_panel_toplevel_update_placement (toplevel); } -#endif // HAVE_WAYLAND +#endif /* HAVE_WAYLAND */ return geometry_changed; } @@ -1928,7 +1928,7 @@ panel_toplevel_update_hidden_position (PanelToplevel *toplevel, width = toplevel->priv->original_width; height = toplevel->priv->original_height; - //FIXME should find a better default + /* FIXME should find a better default */ min_hide_size = DEFAULT_AUTO_HIDE_SIZE; switch (toplevel->priv->state) { @@ -2188,7 +2188,7 @@ panel_toplevel_update_position (PanelToplevel *toplevel) } panel_toplevel_update_expanded_position (toplevel); - panel_toplevel_calc_floating (toplevel); //FIXME should probably be done after panel_toplevel_update_normal_position() too + panel_toplevel_calc_floating (toplevel); /* FIXME should probably be done after panel_toplevel_update_normal_position() too */ if (toplevel->priv->x_right == -1) x = toplevel->priv->x; @@ -2532,7 +2532,7 @@ panel_toplevel_update_geometry (PanelToplevel *toplevel, NULL, NULL); } } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ panel_toplevel_update_edges (toplevel); panel_toplevel_update_description (toplevel); @@ -3029,7 +3029,7 @@ panel_toplevel_realize (GtkWidget *widget) panel_struts_set_window_hint (toplevel); gdk_window_set_geometry_hints (window, NULL, 0); } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ gdk_window_set_group (window, window); panel_toplevel_initially_hide (toplevel); @@ -3645,7 +3645,7 @@ panel_toplevel_start_animation (PanelToplevel *toplevel) &toplevel->priv->animation_end_width, &toplevel->priv->animation_end_height); } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ panel_toplevel_update_struts (toplevel, FALSE); gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET (toplevel)), &cur_x, &cur_y); @@ -4249,7 +4249,7 @@ panel_toplevel_finalize (GObject *object) #ifdef HAVE_X11 if (GDK_IS_X11_DISPLAY (gtk_widget_get_display (GTK_WIDGET (toplevel)))) panel_struts_unregister_strut (toplevel); -#endif // HAVE_X11 +#endif /* HAVE_X11 */ toplevel_list = g_slist_remove (toplevel_list, toplevel); @@ -4814,7 +4814,7 @@ panel_toplevel_init (PanelToplevel *toplevel) if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) { wayland_panel_toplevel_init (toplevel); } -#endif // HAVE_WAYLAND +#endif /* HAVE_WAYLAND */ } PanelWidget * @@ -5064,7 +5064,7 @@ panel_toplevel_set_orientation (PanelToplevel *toplevel, if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (GTK_WIDGET (toplevel)))) { wayland_panel_toplevel_update_placement (toplevel); } -#endif // HAVE_WAYLAND +#endif /* HAVE_WAYLAND */ } PanelOrientation diff --git a/mate-panel/panel-util.c b/mate-panel/panel-util.c index 1f2d4e1c..8d5f2848 100644 --- a/mate-panel/panel-util.c +++ b/mate-panel/panel-util.c @@ -1055,7 +1055,7 @@ panel_util_get_label_for_uri (const char *text_uri) label = NULL; - //FIXME: see caja_query_to_readable_string() to have a nice name + /* FIXME: see caja_query_to_readable_string() to have a nice name */ if (g_str_has_prefix (text_uri, "x-caja-search:")) return g_strdup (_("Search")); diff --git a/mate-panel/panel-widget.c b/mate-panel/panel-widget.c index 30c9185e..c2845cdb 100644 --- a/mate-panel/panel-widget.c +++ b/mate-panel/panel-widget.c @@ -195,7 +195,7 @@ add_all_move_bindings (PanelWidget *panel) GtkWidget *focus_widget; focus_widget = gtk_window_get_focus (GTK_WINDOW (panel->toplevel)); - // will always be false when not on X + /* will always be false when not on X */ if (GTK_IS_SOCKET (focus_widget)) { /* * If the focus widget is a GtkSocket, i.e. the @@ -208,7 +208,7 @@ add_all_move_bindings (PanelWidget *panel) gtk_widget_grab_focus (GTK_WIDGET (panel)); saved_focus_widget = focus_widget; } -#endif // HAVE_X11 +#endif /* HAVE_X11 */ } static void diff --git a/mate-panel/panel-xutils.h b/mate-panel/panel-xutils.h index 4cba602e..2d792aca 100644 --- a/mate-panel/panel-xutils.h +++ b/mate-panel/panel-xutils.h @@ -25,7 +25,7 @@ #ifndef __PANEL_XUTILS_H__ #define __PANEL_XUTILS_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 diff --git a/mate-panel/xstuff.h b/mate-panel/xstuff.h index 65899778..385b7a31 100644 --- a/mate-panel/xstuff.h +++ b/mate-panel/xstuff.h @@ -1,7 +1,7 @@ #ifndef __XSTUFF_H__ #define __XSTUFF_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