diff options
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/fixedtip.h | 1 | ||||
-rw-r--r-- | src/ui/frames.c | 2 | ||||
-rw-r--r-- | src/ui/gradient.c | 4 | ||||
-rw-r--r-- | src/ui/gradient.h | 2 | ||||
-rw-r--r-- | src/ui/menu.c | 1 | ||||
-rw-r--r-- | src/ui/menu.h | 3 | ||||
-rw-r--r-- | src/ui/metaaccellabel.c | 2 | ||||
-rw-r--r-- | src/ui/metaaccellabel.h | 4 | ||||
-rw-r--r-- | src/ui/preview-widget.h | 1 | ||||
-rw-r--r-- | src/ui/tabpopup.c | 3 | ||||
-rw-r--r-- | src/ui/theme-parser.c | 2 | ||||
-rw-r--r-- | src/ui/theme-viewer.c | 2 | ||||
-rw-r--r-- | src/ui/theme.c | 4 | ||||
-rw-r--r-- | src/ui/theme.h | 6 | ||||
-rw-r--r-- | src/ui/tile-preview.c | 1 | ||||
-rw-r--r-- | src/ui/ui.c | 1 |
16 files changed, 0 insertions, 39 deletions
diff --git a/src/ui/fixedtip.h b/src/ui/fixedtip.h index 9a7dd78b..3184d173 100644 --- a/src/ui/fixedtip.h +++ b/src/ui/fixedtip.h @@ -60,5 +60,4 @@ void meta_fixed_tip_show (int root_x, int root_y, */ void meta_fixed_tip_hide (void); - #endif diff --git a/src/ui/frames.c b/src/ui/frames.c index e70480a6..a56d8f93 100644 --- a/src/ui/frames.c +++ b/src/ui/frames.c @@ -90,7 +90,6 @@ static MetaUIFrame* meta_frames_lookup_window (MetaFrames *frames, static void meta_frames_font_changed (MetaFrames *frames); static void meta_frames_button_layout_changed (MetaFrames *frames); - static GdkRectangle* control_rect (MetaFrameControl control, MetaFrameGeometry *fgeom); static MetaFrameControl get_control (MetaFrames *frames, @@ -2027,7 +2026,6 @@ meta_frames_update_prelit_control (MetaFrames *frames, MetaFrameControl old_control; MetaCursor cursor; - meta_verbose ("Updating prelit control from %u to %u\n", frame->prelit_control, control); diff --git a/src/ui/gradient.c b/src/ui/gradient.c index d9bbb3f5..7a9be6ad 100644 --- a/src/ui/gradient.c +++ b/src/ui/gradient.c @@ -211,7 +211,6 @@ meta_gradient_create_vertical (int width, int height, return pixbuf; } - /* *---------------------------------------------------------------------- * meta_gradient_create_diagonal-- @@ -226,7 +225,6 @@ meta_gradient_create_vertical (int width, int height, *---------------------------------------------------------------------- */ - static GdkPixbuf* meta_gradient_create_diagonal (int width, int height, const GdkRGBA *from, @@ -274,7 +272,6 @@ meta_gradient_create_diagonal (int width, int height, return pixbuf; } - static GdkPixbuf* meta_gradient_create_multi_horizontal (int width, int height, const GdkRGBA *colors, @@ -448,7 +445,6 @@ meta_gradient_create_multi_vertical (int width, int height, return pixbuf; } - static GdkPixbuf* meta_gradient_create_multi_diagonal (int width, int height, const GdkRGBA *colors, diff --git a/src/ui/gradient.h b/src/ui/gradient.h index 8da20485..cbecf5d1 100644 --- a/src/ui/gradient.h +++ b/src/ui/gradient.h @@ -60,7 +60,6 @@ GdkPixbuf* meta_gradient_create_interwoven (int width, const GdkRGBA colors2[2], int thickness2); - /* Generate an alpha gradient and multiply it with the existing alpha * channel of the given pixbuf */ @@ -69,5 +68,4 @@ void meta_gradient_add_alpha (GdkPixbuf *pixbuf, int n_alphas, MetaGradientType type); - #endif diff --git a/src/ui/menu.c b/src/ui/menu.c index aeba64fa..ac5fb2c1 100644 --- a/src/ui/menu.c +++ b/src/ui/menu.c @@ -52,7 +52,6 @@ struct _MenuItem { const char* label; }; - struct _MenuData { MetaWindowMenu* menu; MetaMenuOp op; diff --git a/src/ui/menu.h b/src/ui/menu.h index 27f89dfe..7af4ad8e 100644 --- a/src/ui/menu.h +++ b/src/ui/menu.h @@ -31,8 +31,6 @@ #define MARCO_STOCK_MINIMIZE "go-down" #define MARCO_STOCK_MAXIMIZE "view-fullscreen" - - struct _MetaWindowMenu { MetaFrames* frames; Window client_xwindow; @@ -47,5 +45,4 @@ MetaWindowMenu* meta_window_menu_new(MetaFrames* frames, MetaMenuOp ops, MetaMen void meta_window_menu_popup(MetaWindowMenu* menu, int root_x, int root_y, int button, guint32 timestamp); void meta_window_menu_free(MetaWindowMenu* menu); - #endif diff --git a/src/ui/metaaccellabel.c b/src/ui/metaaccellabel.c index 93c16152..f6903d44 100644 --- a/src/ui/metaaccellabel.c +++ b/src/ui/metaaccellabel.c @@ -53,7 +53,6 @@ static void meta_accel_label_get_preferred_height (GtkWidget *widget, static gboolean meta_accel_label_draw (GtkWidget *widget, cairo_t *cr); - G_DEFINE_TYPE (MetaAccelLabel, meta_accel_label, GTK_TYPE_LABEL); static void @@ -166,7 +165,6 @@ meta_accel_label_destroy (GtkWidget *object) { MetaAccelLabel *accel_label = META_ACCEL_LABEL (object); - g_free (accel_label->accel_string); accel_label->accel_string = NULL; diff --git a/src/ui/metaaccellabel.h b/src/ui/metaaccellabel.h index c2a4fa20..5d8132a1 100644 --- a/src/ui/metaaccellabel.h +++ b/src/ui/metaaccellabel.h @@ -41,7 +41,6 @@ extern "C" { #endif /* __cplusplus */ - #define META_TYPE_ACCEL_LABEL (meta_accel_label_get_type ()) #define META_ACCEL_LABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_ACCEL_LABEL, MetaAccelLabel)) #define META_ACCEL_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_ACCEL_LABEL, MetaAccelLabelClass)) @@ -49,7 +48,6 @@ extern "C" { #define META_IS_ACCEL_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_ACCEL_LABEL)) #define META_ACCEL_LABEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_ACCEL_LABEL, MetaAccelLabelClass)) - typedef struct _MetaAccelLabel MetaAccelLabel; typedef struct _MetaAccelLabelClass MetaAccelLabelClass; @@ -97,10 +95,8 @@ void meta_accel_label_set_accelerator (MetaAccelLabel *accel_lab guint accelerator_key, MetaVirtualModifier accelerator_mods); - #ifdef __cplusplus } #endif /* __cplusplus */ - #endif /* __META_ACCEL_LABEL_H__ */ diff --git a/src/ui/preview-widget.h b/src/ui/preview-widget.h index 898a226d..462c445a 100644 --- a/src/ui/preview-widget.h +++ b/src/ui/preview-widget.h @@ -60,7 +60,6 @@ struct _MetaPreviewClass GtkBinClass parent_class; }; - GType meta_preview_get_type (void) G_GNUC_CONST; GtkWidget* meta_preview_new (void); diff --git a/src/ui/tabpopup.c b/src/ui/tabpopup.c index e5cd8736..d3b9ba62 100644 --- a/src/ui/tabpopup.c +++ b/src/ui/tabpopup.c @@ -727,7 +727,6 @@ meta_ui_tab_popup_mouse_press (MetaTabPopup *popup, } } - #define META_TYPE_SELECT_IMAGE (meta_select_image_get_type ()) #define META_SELECT_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_SELECT_IMAGE, MetaSelectImage)) @@ -745,7 +744,6 @@ struct _MetaSelectImageClass GtkImageClass parent_class; }; - static GType meta_select_image_get_type (void) G_GNUC_CONST; static GtkWidget* @@ -920,7 +918,6 @@ struct _MetaSelectWorkspaceClass GtkDrawingAreaClass parent_class; }; - static GType meta_select_workspace_get_type (void) G_GNUC_CONST; #define SELECT_OUTLINE_WIDTH 2 diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c index 66130459..a200876c 100644 --- a/src/ui/theme-parser.c +++ b/src/ui/theme-parser.c @@ -151,7 +151,6 @@ static void push_state (ParseInfo *info, static void pop_state (ParseInfo *info); static ParseState peek_state (ParseInfo *info); - static void parse_toplevel_element (GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, @@ -3133,7 +3132,6 @@ parse_style_set_element (GMarkupParseContext *context, return; } - frame_resize = meta_frame_resize_from_string (resize); if (frame_resize == META_FRAME_RESIZE_LAST) { diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c index dc348fa1..35fcdda3 100644 --- a/src/ui/theme-viewer.c +++ b/src/ui/theme-viewer.c @@ -755,7 +755,6 @@ init_layouts (void) #endif } - static GtkWidget* previews_of_button_layouts (void) { @@ -974,7 +973,6 @@ main (int argc, char **argv) return 0; } - static MetaFrameFlags get_flags (GtkWidget *widget) { diff --git a/src/ui/theme.c b/src/ui/theme.c index 711fa0cd..51be390d 100644 --- a/src/ui/theme.c +++ b/src/ui/theme.c @@ -2934,7 +2934,6 @@ meta_parse_position_expression (MetaDrawSpec *spec, return TRUE; } - gboolean meta_parse_size_expression (MetaDrawSpec *spec, const MetaPositionExprEnv *env, @@ -5284,7 +5283,6 @@ meta_frame_style_set_unref (MetaFrameStyleSet *style_set) } } - static MetaFrameStyle* get_style (MetaFrameStyleSet *style_set, MetaFrameState state, @@ -5532,7 +5530,6 @@ meta_theme_new (void) return theme; } - void meta_theme_free (MetaTheme *theme) { @@ -6234,7 +6231,6 @@ meta_theme_lookup_color_constant (MetaTheme *theme, } } - PangoFontDescription* meta_gtk_widget_get_font_desc (GtkWidget *widget, double scale, diff --git a/src/ui/theme.h b/src/ui/theme.h index 9dfb8d89..b32690f1 100644 --- a/src/ui/theme.h +++ b/src/ui/theme.h @@ -966,7 +966,6 @@ MetaAlphaGradientSpec* meta_alpha_gradient_spec_new (MetaGradientType typ void meta_alpha_gradient_spec_free (MetaAlphaGradientSpec *spec); cairo_pattern_t * meta_alpha_gradient_spec_get_mask (const MetaAlphaGradientSpec *spec); - MetaFrameStyle* meta_frame_style_new (MetaFrameStyle *parent); void meta_frame_style_ref (MetaFrameStyle *style); void meta_frame_style_unref (MetaFrameStyle *style); @@ -983,7 +982,6 @@ void meta_frame_style_draw (MetaFrameStyle *style, GdkPixbuf *mini_icon, GdkPixbuf *icon); - void meta_frame_style_draw_with_style (MetaFrameStyle *style, GtkStyleContext *style_gtk, cairo_t *cr, @@ -996,7 +994,6 @@ void meta_frame_style_draw_with_style (MetaFrameStyle *style, GdkPixbuf *mini_icon, GdkPixbuf *icon); - gboolean meta_frame_style_validate (MetaFrameStyle *style, guint current_theme_version, GError **error); @@ -1057,7 +1054,6 @@ void meta_theme_draw_frame_by_name (MetaTheme *theme, GdkPixbuf *mini_icon, GdkPixbuf *icon); - void meta_theme_get_frame_borders (MetaTheme *theme, MetaFrameType type, int text_height, @@ -1128,7 +1124,6 @@ PangoFontDescription* meta_gtk_widget_get_font_desc (GtkWidget int meta_pango_font_desc_get_text_height (const PangoFontDescription *font_desc, PangoContext *context); - /* Enum converters */ MetaGtkColorComponent meta_color_component_from_string (const char *str); const char* meta_color_component_to_string (MetaGtkColorComponent component); @@ -1165,7 +1160,6 @@ void meta_gtk_style_get_dark_color (GtkStyleContext *st guint meta_theme_earliest_version_with_button (MetaButtonType type); - #define META_THEME_ALLOWS(theme, feature) (theme->format_version >= feature) /* What version of the theme file format were various features introduced in? */ diff --git a/src/ui/tile-preview.c b/src/ui/tile-preview.c index 1f61e07b..2d9493a5 100644 --- a/src/ui/tile-preview.c +++ b/src/ui/tile-preview.c @@ -33,7 +33,6 @@ #define OUTLINE_WIDTH 5 /* frame width in non-composite case */ - struct _MetaTilePreview { GtkWidget *preview_window; diff --git a/src/ui/ui.c b/src/ui/ui.c index 9c99552d..44c72938 100644 --- a/src/ui/ui.c +++ b/src/ui/ui.c @@ -487,7 +487,6 @@ meta_ui_queue_frame_draw (MetaUI *ui, meta_frames_queue_draw (ui->frames, xwindow); } - void meta_ui_set_frame_title (MetaUI *ui, Window xwindow, |