From 03e38ada456be8fecd04fde9fa6a8293816292aa Mon Sep 17 00:00:00 2001 From: rbuj Date: Wed, 27 Oct 2021 17:50:56 +0200 Subject: Use a blank line at most --- libmate-desktop/display-name.c | 1 - libmate-desktop/mate-bg.c | 9 --------- libmate-desktop/mate-colorbutton.c | 4 ---- libmate-desktop/mate-colorbutton.h | 3 --- libmate-desktop/mate-colorsel.c | 11 ----------- libmate-desktop/mate-colorsel.h | 4 ---- libmate-desktop/mate-colorseldialog.c | 1 - libmate-desktop/mate-colorseldialog.h | 4 ---- libmate-desktop/mate-desktop-item.c | 14 -------------- libmate-desktop/mate-desktop-item.h | 1 - libmate-desktop/mate-desktop-thumbnail.h | 1 - libmate-desktop/mate-hsv.c | 5 ----- libmate-desktop/mate-hsv.h | 2 -- libmate-desktop/mate-rr-config.c | 1 - libmate-desktop/mate-rr-config.h | 1 - libmate-desktop/mate-rr.c | 1 - libmate-desktop/test-ditem.c | 2 -- 17 files changed, 65 deletions(-) (limited to 'libmate-desktop') diff --git a/libmate-desktop/display-name.c b/libmate-desktop/display-name.c index 85971a7..d9eea2d 100644 --- a/libmate-desktop/display-name.c +++ b/libmate-desktop/display-name.c @@ -223,7 +223,6 @@ static void read_pnp_ids(void) } } - static const char* find_vendor(const char* code) { const char* vendor_name; diff --git a/libmate-desktop/mate-bg.c b/libmate-desktop/mate-bg.c index e511975..60513ea 100644 --- a/libmate-desktop/mate-bg.c +++ b/libmate-desktop/mate-bg.c @@ -441,7 +441,6 @@ mate_bg_save_to_gsettings (MateBG *bg, g_free (secondary); } - static void mate_bg_init (MateBG *bg) { @@ -940,7 +939,6 @@ get_scaled_pixbuf (MateBGPlacement placement, return new; } - static void draw_image_area (MateBG *bg, gint num_monitor, @@ -1223,7 +1221,6 @@ mate_bg_create_surface_scale (MateBG *bg, return surface; } - /* determine if a background is darker or lighter than average, to help * clients know what colors to draw on top with */ @@ -1703,7 +1700,6 @@ struct _SlideShow GQueue *stack; }; - #if GLIB_CHECK_VERSION(2,61,2) static double now (void) @@ -2050,7 +2046,6 @@ blow_expensive_caches_in_idle (MateBG *bg) } } - static gboolean on_timeout (gpointer data) { @@ -3061,7 +3056,6 @@ read_slideshow_file (const char *filename, show = NULL; } - if (show) { if (!g_markup_parse_context_end_parse (context, err)) { slideshow_unref (show); @@ -3132,7 +3126,6 @@ create_thumbnail_for_filename (MateDesktopThumbnailFactory *factory, result = pixbuf_scale_to_fit (orig, THUMBNAIL_SIZE, THUMBNAIL_SIZE); - g_object_set_data_full (G_OBJECT (result), "mate-thumbnail-height", g_strdup_printf ("%d", orig_height), g_free); g_object_set_data_full (G_OBJECT (result), "mate-thumbnail-width", @@ -3236,7 +3229,6 @@ mate_bg_create_frame_thumbnail (MateBG *bg, if (!show) return NULL; - if (frame_num < 0 || frame_num >= g_queue_get_length (show->slides)) return NULL; @@ -3258,7 +3250,6 @@ mate_bg_create_frame_thumbnail (MateBG *bg, if (!found) return NULL; - result = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, dest_width, dest_height); draw_color (bg, result); diff --git a/libmate-desktop/mate-colorbutton.c b/libmate-desktop/mate-colorbutton.c index 9596735..52d658f 100644 --- a/libmate-desktop/mate-colorbutton.c +++ b/libmate-desktop/mate-colorbutton.c @@ -113,7 +113,6 @@ static void mate_color_button_drag_data_received (GtkWidget *widget, guint32 time, MateColorButton *color_button); - static guint color_button_signals[LAST_SIGNAL] = { 0 }; static const GtkTargetEntry drop_types[] = { { "application/x-color", 0, 0 } }; @@ -337,7 +336,6 @@ mate_color_button_drag_data_received (GtkWidget *widget, return; } - dropped = (guint16 *)gtk_selection_data_get_data (selection_data); color_button->priv->color.red = dropped[0]; @@ -480,7 +478,6 @@ mate_color_button_finalize (GObject *object) G_OBJECT_CLASS (mate_color_button_parent_class)->finalize (object); } - /** * mate_color_button_new: * @@ -792,7 +789,6 @@ mate_color_button_get_use_alpha (MateColorButton *color_button) return color_button->priv->use_alpha; } - /** * mate_color_button_set_title: * @color_button: a #MateColorButton diff --git a/libmate-desktop/mate-colorbutton.h b/libmate-desktop/mate-colorbutton.h index 2670e03..caff2ad 100644 --- a/libmate-desktop/mate-colorbutton.h +++ b/libmate-desktop/mate-colorbutton.h @@ -37,7 +37,6 @@ G_BEGIN_DECLS - /* The MateColorButton widget is a simple color picker in a button. * The button displays a sample of the currently selected color. When * the user clicks on the button, a color selection dialog pops up. @@ -75,7 +74,6 @@ struct _MateColorButtonClass { void (*_gtk_reserved4) (void); }; - GType mate_color_button_get_type (void) G_GNUC_CONST; GtkWidget *mate_color_button_new (void); GtkWidget *mate_color_button_new_with_color (const GdkColor *color); @@ -97,7 +95,6 @@ void mate_color_button_set_title (MateColorButton *color_button, const gchar *title); const gchar *mate_color_button_get_title (MateColorButton *color_button); - G_END_DECLS #endif /* __MATE_COLOR_BUTTON_H__ */ diff --git a/libmate-desktop/mate-colorsel.c b/libmate-desktop/mate-colorsel.c index db7eb71..aca4053 100644 --- a/libmate-desktop/mate-colorsel.c +++ b/libmate-desktop/mate-colorsel.c @@ -132,7 +132,6 @@ struct _MateColorSelectionPrivate gulong settings_connection; }; - static void mate_color_selection_dispose (GObject *object); static void mate_color_selection_finalize (GObject *object); static void update_color (MateColorSelection *colorsel); @@ -300,7 +299,6 @@ mate_color_selection_class_init (MateColorSelectionClass *klass) "", G_PARAM_READABLE)); - color_selection_signals[COLOR_CHANGED] = g_signal_new ("color-changed", G_OBJECT_CLASS_TYPE (gobject_class), @@ -866,7 +864,6 @@ color_sample_draw_sample (MateColorSelection *colorsel, cairo_t *cr, int which) cairo_fill (cr); } - static void color_sample_update_samples (MateColorSelection *colorsel) { @@ -884,7 +881,6 @@ color_old_sample_draw (GtkWidget *da, return FALSE; } - static gboolean color_cur_sample_draw (GtkWidget *da, cairo_t *cr, @@ -991,7 +987,6 @@ color_sample_new (MateColorSelection *colorsel) gtk_widget_show_all (priv->sample_area); } - /* * * The palette area code @@ -1383,7 +1378,6 @@ do_popup (MateColorSelection *colorsel, 3, timestamp); } - static gboolean palette_enter (GtkWidget *drawing_area, GdkEventCrossing *event, @@ -1543,7 +1537,6 @@ palette_popup (GtkWidget *widget, return TRUE; } - static GtkWidget* palette_new (MateColorSelection *colorsel) { @@ -1594,7 +1587,6 @@ palette_new (MateColorSelection *colorsel) return retval; } - /* * * The actual MateColorSelection widget @@ -2626,7 +2618,6 @@ mate_color_selection_set_previous_alpha (MateColorSelection *colorsel, priv->changing = FALSE; } - /** * mate_color_selection_get_previous_color: * @colorsel: a #MateColorSelection. @@ -2721,7 +2712,6 @@ mate_color_selection_is_adjusting (MateColorSelection *colorsel) return (mate_hsv_is_adjusting (MATE_HSV (priv->triangle_colorsel))); } - /** * mate_color_selection_palette_from_string: * @str: a string encoding a color palette. @@ -2931,4 +2921,3 @@ make_all_relations (AtkObject *atk_obj, make_control_relations (atk_obj, priv->blue_spinbutton); } - diff --git a/libmate-desktop/mate-colorsel.h b/libmate-desktop/mate-colorsel.h index bb44c5f..245c55e 100644 --- a/libmate-desktop/mate-colorsel.h +++ b/libmate-desktop/mate-colorsel.h @@ -40,12 +40,10 @@ G_BEGIN_DECLS #define MATE_IS_COLOR_SELECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MATE_TYPE_COLOR_SELECTION)) #define MATE_COLOR_SELECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MATE_TYPE_COLOR_SELECTION, MateColorSelectionClass)) - typedef struct _MateColorSelection MateColorSelection; typedef struct _MateColorSelectionClass MateColorSelectionClass; typedef struct _MateColorSelectionPrivate MateColorSelectionPrivate; - typedef void (* MateColorSelectionChangePaletteFunc) (const GdkColor *colors, gint n_colors); typedef void (* MateColorSelectionChangePaletteWithScreenFunc) (GdkScreen *screen, @@ -73,7 +71,6 @@ struct _MateColorSelectionClass void (*_gtk_reserved4) (void); }; - /* ColorSelection */ GType mate_color_selection_get_type (void) G_GNUC_CONST; @@ -85,7 +82,6 @@ gboolean mate_color_selection_get_has_palette (MateColorSelection *col void mate_color_selection_set_has_palette (MateColorSelection *colorsel, gboolean has_palette); - void mate_color_selection_set_current_color (MateColorSelection *colorsel, const GdkColor *color); void mate_color_selection_set_current_alpha (MateColorSelection *colorsel, diff --git a/libmate-desktop/mate-colorseldialog.c b/libmate-desktop/mate-colorseldialog.c index c947921..919c8a5 100644 --- a/libmate-desktop/mate-colorseldialog.c +++ b/libmate-desktop/mate-colorseldialog.c @@ -40,7 +40,6 @@ enum { PROP_HELP_BUTTON }; - /***************************/ /* MateColorSelectionDialog */ /***************************/ diff --git a/libmate-desktop/mate-colorseldialog.h b/libmate-desktop/mate-colorseldialog.h index 103195f..c355714 100644 --- a/libmate-desktop/mate-colorseldialog.h +++ b/libmate-desktop/mate-colorseldialog.h @@ -39,11 +39,9 @@ G_BEGIN_DECLS #define MATE_IS_COLOR_SELECTION_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MATE_TYPE_COLOR_SELECTION_DIALOG)) #define MATE_COLOR_SELECTION_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MATE_TYPE_COLOR_SELECTION_DIALOG, MateColorSelectionDialogClass)) - typedef struct _MateColorSelectionDialog MateColorSelectionDialog; typedef struct _MateColorSelectionDialogClass MateColorSelectionDialogClass; - struct _MateColorSelectionDialog { GtkDialog parent_instance; @@ -65,13 +63,11 @@ struct _MateColorSelectionDialogClass void (*_gtk_reserved4) (void); }; - /* ColorSelectionDialog */ GType mate_color_selection_dialog_get_type (void) G_GNUC_CONST; GtkWidget* mate_color_selection_dialog_new (const gchar *title); GtkWidget* mate_color_selection_dialog_get_color_selection (MateColorSelectionDialog *colorsel); - G_END_DECLS #endif /* __MATE_COLOR_SELECTION_DIALOG_H__ */ diff --git a/libmate-desktop/mate-desktop-item.c b/libmate-desktop/mate-desktop-item.c index 7e02347..1880fee 100644 --- a/libmate-desktop/mate-desktop-item.c +++ b/libmate-desktop/mate-desktop-item.c @@ -414,7 +414,6 @@ copy_string_hash (gpointer key, gpointer value, gpointer user_data) g_strdup (value)); } - /** * mate_desktop_item_copy: * @item: The item to be copied @@ -509,7 +508,6 @@ make_fake_directory (GFile *dir) mate_desktop_item_set_entry_type (item, MATE_DESKTOP_ITEM_TYPE_DIRECTORY); - item->mtime = DONT_UPDATE_MTIME; /* it doesn't exist, we know that */ child = g_file_get_child (dir, ".directory"); mate_desktop_item_set_location_gfile (item, child); @@ -976,7 +974,6 @@ key_basename (const char *key) return key; } - static const char * lookup (const MateDesktopItem *item, const char *key) { @@ -1824,7 +1821,6 @@ ditem_execute (const MateDesktopItem *item, sn_error_trap_push, sn_error_trap_pop); - /* Only initiate notification if desktop file supports it. * (we could avoid setting up the SnLauncherContext if we aren't going * to initiate, but why bother) @@ -1977,7 +1973,6 @@ ditem_execute (const MateDesktopItem *item, } #endif - if ( ! g_spawn_async (working_dir, real_argv, envp, @@ -2059,7 +2054,6 @@ strip_the_amp (char *exec) return TRUE; } - static int mate_desktop_item_launch_on_screen_with_env ( const MateDesktopItem *item, @@ -2109,7 +2103,6 @@ mate_desktop_item_launch_on_screen_with_env ( return -1; } - if (exec == NULL || exec[0] == '\0') { g_set_error (error, @@ -2119,7 +2112,6 @@ mate_desktop_item_launch_on_screen_with_env ( return -1; } - /* make a new copy and get rid of spaces */ the_exec = g_alloca (strlen (exec) + 1); g_strlcpy (the_exec, exec, strlen (exec) + 1); @@ -2436,8 +2428,6 @@ mate_desktop_item_set_entry_type (MateDesktopItem *item, } } - - /** * mate_desktop_item_get_file_status: * @item: A desktop item @@ -2526,7 +2516,6 @@ mate_desktop_item_find_icon (GtkIconTheme *icon_theme, *p = 0; } - info = gtk_icon_theme_lookup_icon (icon_theme, icon_no_extension, desired_size, @@ -3062,7 +3051,6 @@ cannonize (const char *key, const char *value) return NULL; } - static char * decode_string_and_dup (const char *s) { @@ -3448,7 +3436,6 @@ insert_key (MateDesktopItem *item, } } - if (cur_section == NULL) { /* only add to list if we haven't seen it before */ if (g_hash_table_lookup (item->main_hash, k) == NULL) { @@ -3521,7 +3508,6 @@ try_english_key (MateDesktopItem *item, const char *key) return str; } - static void sanitize (MateDesktopItem *item, const char *uri) { diff --git a/libmate-desktop/mate-desktop-item.h b/libmate-desktop/mate-desktop-item.h index 76f1660..a5e3f08 100644 --- a/libmate-desktop/mate-desktop-item.h +++ b/libmate-desktop/mate-desktop-item.h @@ -225,7 +225,6 @@ char * mate_desktop_item_find_icon (GtkIconTheme int desired_size, int flags); - /* * Reading/Writing different sections, NULL is the standard section */ diff --git a/libmate-desktop/mate-desktop-thumbnail.h b/libmate-desktop/mate-desktop-thumbnail.h index 1bb9492..bb0cbcb 100644 --- a/libmate-desktop/mate-desktop-thumbnail.h +++ b/libmate-desktop/mate-desktop-thumbnail.h @@ -87,7 +87,6 @@ void mate_desktop_thumbnail_factory_create_failed_thumbnail (MateDesktopTh const char *uri, time_t mtime); - /* Thumbnailing utils: */ gboolean mate_desktop_thumbnail_has_uri (GdkPixbuf *pixbuf, const char *uri); diff --git a/libmate-desktop/mate-hsv.c b/libmate-desktop/mate-hsv.c index 0577115..440e47b 100644 --- a/libmate-desktop/mate-hsv.c +++ b/libmate-desktop/mate-hsv.c @@ -61,7 +61,6 @@ /* Default ring width */ #define DEFAULT_RING_WIDTH 10 - /* Dragging modes */ typedef enum { DRAG_NONE, @@ -90,7 +89,6 @@ struct _MateHSVPrivate guint focus_on_ring : 1; }; - /* Signal IDs */ enum { @@ -337,7 +335,6 @@ mate_hsv_size_allocate (GtkWidget *widget, allocation->height); } - /* Utility functions */ #define INTENSITY(r, g, b) ((r) * 0.30 + (g) * 0.59 + (b) * 0.11) @@ -761,7 +758,6 @@ mate_hsv_motion (GtkWidget *widget, return FALSE; } - /* Redrawing */ /* Paints the hue ring */ @@ -1127,7 +1123,6 @@ mate_hsv_draw (GtkWidget *widget, paint_ring (hsv, cr); paint_triangle (hsv, cr, draw_focus); - if (draw_focus && priv->focus_on_ring) { GtkStyleContext *context; diff --git a/libmate-desktop/mate-hsv.h b/libmate-desktop/mate-hsv.h index 4d47668..ebc3104 100644 --- a/libmate-desktop/mate-hsv.h +++ b/libmate-desktop/mate-hsv.h @@ -44,7 +44,6 @@ G_BEGIN_DECLS #define MATE_IS_HSV_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MATE_TYPE_HSV)) #define MATE_HSV_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MATE_TYPE_HSV, MateHSVClass)) - typedef struct _MateHSV MateHSV; typedef struct _MateHSVPrivate MateHSVPrivate; typedef struct _MateHSVClass MateHSVClass; @@ -75,7 +74,6 @@ struct _MateHSVClass void (*_gtk_reserved4) (void); }; - GType mate_hsv_get_type (void) G_GNUC_CONST; GtkWidget* mate_hsv_new (void); void mate_hsv_set_color (MateHSV *hsv, diff --git a/libmate-desktop/mate-rr-config.c b/libmate-desktop/mate-rr-config.c index 964846c..10601f0 100644 --- a/libmate-desktop/mate-rr-config.c +++ b/libmate-desktop/mate-rr-config.c @@ -1423,7 +1423,6 @@ mate_rr_config_set_clone (MateRRConfig *self, gboolean clone) self->priv->clone = clone; } - /* * CRTC assignment */ diff --git a/libmate-desktop/mate-rr-config.h b/libmate-desktop/mate-rr-config.h index 0321035..acbcb68 100644 --- a/libmate-desktop/mate-rr-config.h +++ b/libmate-desktop/mate-rr-config.h @@ -64,7 +64,6 @@ char *mate_rr_output_info_get_name (MateRROutputInfo *self); gboolean mate_rr_output_info_is_active (MateRROutputInfo *self); void mate_rr_output_info_set_active (MateRROutputInfo *self, gboolean active); - void mate_rr_output_info_get_geometry (MateRROutputInfo *self, int *x, int *y, int *width, int *height); void mate_rr_output_info_set_geometry (MateRROutputInfo *self, int x, int y, int width, int height); diff --git a/libmate-desktop/mate-rr.c b/libmate-desktop/mate-rr.c index e856399..97db0bd 100644 --- a/libmate-desktop/mate-rr.c +++ b/libmate-desktop/mate-rr.c @@ -160,7 +160,6 @@ static void mode_initialize (MateRRMode *mode, static MateRRMode * mode_copy (const MateRRMode *from); static void mode_free (MateRRMode *mode); - static void mate_rr_screen_finalize (GObject*); static void mate_rr_screen_set_property (GObject*, guint, const GValue*, GParamSpec*); static void mate_rr_screen_get_property (GObject*, guint, GValue*, GParamSpec*); diff --git a/libmate-desktop/test-ditem.c b/libmate-desktop/test-ditem.c index 8ab6d29..5eab025 100644 --- a/libmate-desktop/test-ditem.c +++ b/libmate-desktop/test-ditem.c @@ -74,7 +74,6 @@ test_ditem (const char *file) "de"); g_print ("NAME(lang=de): |%s|\n", text); - text = mate_desktop_item_get_localestring_lang (ditem, MATE_DESKTOP_ITEM_NAME, NULL); @@ -127,7 +126,6 @@ launch_item (const char *file) g_print ("launch returned: %d\n", ret); } - int main (int argc, char **argv) { -- cgit v1.2.1