diff options
56 files changed, 0 insertions, 159 deletions
diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c index 5b40b82e..b4d571f2 100644 --- a/src/compositor/compositor-xrender.c +++ b/src/compositor/compositor-xrender.c @@ -1531,7 +1531,6 @@ paint_windows (MetaScreen *screen, } } - XFixesSetPictureClipRegion (xdisplay, root_buffer, 0, 0, region); #ifdef HAVE_PRESENT @@ -2597,7 +2596,6 @@ process_unmap (MetaCompositorXRender *compositor, return; } - cw = find_window_in_display (compositor->display, event->window); if (cw) unmap_win (compositor->display, cw->screen, event->window); @@ -3074,7 +3072,6 @@ xrender_free_window (MetaCompositor *compositor, #endif } - static void xrender_process_event (MetaCompositor *compositor, XEvent *event, diff --git a/src/core/async-getprop.h b/src/core/async-getprop.h index b975d0f0..f222cf03 100644 --- a/src/core/async-getprop.h +++ b/src/core/async-getprop.h @@ -62,6 +62,3 @@ void* ag_Xmalloc0 (unsigned long bytes); #endif - - - diff --git a/src/core/boxes.c b/src/core/boxes.c index e05924e6..49c82ccc 100644 --- a/src/core/boxes.c +++ b/src/core/boxes.c @@ -721,7 +721,6 @@ meta_rectangle_expand_to_avoiding_struts (MetaRectangle *rect, rect->height = expand_to->height; } - /* Run over all struts */ for (strut_iter = all_struts; strut_iter; strut_iter = strut_iter->next) { @@ -818,7 +817,6 @@ meta_rectangle_overlaps_with_region (const GList *spanning_rects, return overlaps; } - void meta_rectangle_clamp_to_fit_into_region (const GList *spanning_rects, FixedDirections fixed_directions, diff --git a/src/core/constraints.c b/src/core/constraints.c index 99b4077e..90b5be15 100644 --- a/src/core/constraints.c +++ b/src/core/constraints.c @@ -449,7 +449,6 @@ setup_constraint_info (ConstraintInfo *info, meta_workspace_get_onxinerama_region (cur_workspace, xinerama_info->number); - /* Log all this information for debugging */ meta_topic (META_DEBUG_GEOMETRY, "Setting up constraint info:\n" @@ -522,7 +521,6 @@ place_window_if_needed(MetaWindow *window, meta_workspace_get_onxinerama_region (cur_workspace, xinerama_info->number); - info->current.x = placed_rect.x; info->current.y = placed_rect.y; diff --git a/src/core/delete.c b/src/core/delete.c index 056f76be..63f0d2f8 100644 --- a/src/core/delete.c +++ b/src/core/delete.c @@ -148,7 +148,6 @@ meta_window_delete (MetaWindow *window, window); } - void meta_window_kill (MetaWindow *window) { diff --git a/src/core/display-private.h b/src/core/display-private.h index 3352fb72..0352c2ad 100644 --- a/src/core/display-private.h +++ b/src/core/display-private.h @@ -55,7 +55,6 @@ typedef struct MetaEdgeResistanceData MetaEdgeResistanceData; typedef void (*MetaWindowPingFunc) (MetaDisplay* display, Window xwindow, guint32 timestamp, gpointer user_data); - #define _NET_WM_STATE_REMOVE 0 /* remove/unset property */ #define _NET_WM_STATE_ADD 1 /* add/set property */ #define _NET_WM_STATE_TOGGLE 2 /* toggle property */ diff --git a/src/core/display.c b/src/core/display.c index 85f43684..d9400d39 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -233,7 +233,6 @@ remove_pending_pings_for_window (MetaDisplay *display, Window xwindow) g_slist_free (dead); } - #ifdef HAVE_STARTUP_NOTIFICATION static void sn_error_trap_push (SnDisplay *sn_display, @@ -507,7 +506,6 @@ meta_display_open (void) meta_verbose ("Not compiled with Xsync support\n"); #endif /* !HAVE_XSYNC */ - #ifdef HAVE_SHAPE { the_display->have_shape = FALSE; @@ -1722,7 +1720,6 @@ static gboolean event_callback(XEvent* event, gpointer data) window = NULL; } - frame_was_receiver = FALSE; if (window && window->frame && @@ -5098,7 +5095,6 @@ process_selection_clear (MetaDisplay *display, event->xselectionclear.window, event->xselectionclear.selection); - if (screen != NULL) { meta_verbose ("Got selection clear for screen %d on display %s\n", diff --git a/src/core/effects.c b/src/core/effects.c index f23c60f2..6c0f7fdd 100644 --- a/src/core/effects.c +++ b/src/core/effects.c @@ -257,7 +257,6 @@ meta_effect_run_close (MetaWindow *window, run_handler (effect); } - /* old ugly minimization effect */ #ifdef HAVE_SHAPE @@ -576,7 +575,6 @@ draw_xor_rect (MetaScreen *screen, box_width = text_width + 2 * LINE_WIDTH; box_height = text_height + 2 * LINE_WIDTH; - box_x = shrunk_rect.x + (shrunk_rect.width - box_width) / 2; box_y = shrunk_rect.y + (shrunk_rect.height - box_height) / 2; diff --git a/src/core/frame-private.h b/src/core/frame-private.h index 811ac624..8c2a2eeb 100644 --- a/src/core/frame-private.h +++ b/src/core/frame-private.h @@ -77,6 +77,3 @@ void meta_frame_set_screen_cursor (MetaFrame *frame, #endif - - - diff --git a/src/core/frame.c b/src/core/frame.c index 86b78f1f..957f6c76 100644 --- a/src/core/frame.c +++ b/src/core/frame.c @@ -90,7 +90,6 @@ meta_window_ensure_frame (MetaWindow *window) frame->rect.x, frame->rect.y, frame->rect.width, frame->rect.height); - frame->xwindow = meta_ui_create_frame_window (window->screen->ui, window->display->xdisplay, window->xvisual, @@ -230,7 +229,6 @@ meta_window_destroy_frame (MetaWindow *window) meta_window_queue (window, META_QUEUE_MOVE_RESIZE); } - MetaFrameFlags meta_frame_get_flags (MetaFrame *frame) { diff --git a/src/core/group-private.h b/src/core/group-private.h index 88cd0f8b..03c42324 100644 --- a/src/core/group-private.h +++ b/src/core/group-private.h @@ -38,6 +38,3 @@ struct _MetaGroup #endif - - - diff --git a/src/core/group-props.c b/src/core/group-props.c index 23d10b88..1f25ba11 100644 --- a/src/core/group-props.c +++ b/src/core/group-props.c @@ -48,8 +48,6 @@ static void reload_prop_value (MetaGroup *group, static MetaGroupPropHooks* find_hooks (MetaDisplay *display, Atom property); - - void meta_group_reload_property (MetaGroup *group, Atom property) diff --git a/src/core/group.h b/src/core/group.h index 3ae06442..05df653f 100644 --- a/src/core/group.h +++ b/src/core/group.h @@ -48,6 +48,3 @@ gboolean meta_group_property_notify (MetaGroup *group, #endif - - - diff --git a/src/core/iconcache.h b/src/core/iconcache.h index 4614da02..d46abda0 100644 --- a/src/core/iconcache.h +++ b/src/core/iconcache.h @@ -79,6 +79,3 @@ gboolean meta_read_icons (MetaScreen *screen, #endif - - - diff --git a/src/core/keybindings.c b/src/core/keybindings.c index d37ec2cf..1ee36b5e 100644 --- a/src/core/keybindings.c +++ b/src/core/keybindings.c @@ -307,7 +307,6 @@ reload_modifiers (MetaDisplay *display) } } - static int count_bindings (const MetaKeyPref *prefs, int n_prefs) @@ -553,7 +552,6 @@ meta_display_process_mapping_event (MetaDisplay *display, * even when only the keymap changes */ reload_modmap (display); - if (keymap_changed) reload_keycodes (display); @@ -584,7 +582,6 @@ bindings_changed_callback (MetaPreference pref, } } - void meta_display_init_keys (MetaDisplay *display) { @@ -2460,7 +2457,6 @@ meta_spawn_command_line_async_on_screen (const gchar *command_line, return retval; } - static void handle_run_command (MetaDisplay *display, MetaScreen *screen, @@ -2499,7 +2495,6 @@ handle_run_command (MetaDisplay *display, } } - static void handle_maximize_vertically (MetaDisplay *display, MetaScreen *screen, @@ -2698,7 +2693,6 @@ handle_move_to_center (MetaDisplay *display, window->rect.height); } - static void handle_move_to_monitor (MetaDisplay *display, MetaScreen *screen, @@ -2754,7 +2748,6 @@ process_workspace_switch_grab (MetaDisplay *display, "Ending grab so we can focus on the target workspace\n"); meta_display_end_grab_op (display, event->xkey.time); - if(display->grab_op == META_GRAB_OP_KEYBOARD_WORKSPACE_SWITCHING) { meta_topic (META_DEBUG_KEYBINDINGS, @@ -2847,8 +2840,6 @@ process_workspace_switch_grab (MetaDisplay *display, event->xkey.time); } - - return TRUE; /* we already ended the grab */ } } @@ -3126,7 +3117,6 @@ handle_cycle (MetaDisplay *display, backwards, FALSE); } - static void handle_toggle_fullscreen (MetaDisplay *display, MetaScreen *screen, @@ -3632,7 +3622,6 @@ handle_rename_workspace_callback(GIOChannel *ioc, GIOCondition cond, gpointer da return FALSE; } - if (cond & G_IO_ERR ) { meta_warning ("handle_rename_workspace_callback: error. G_IO_ERR.\n"); @@ -3649,7 +3638,6 @@ handle_rename_workspace_callback(GIOChannel *ioc, GIOCondition cond, gpointer da return FALSE; } - meta_topic (META_DEBUG_KEYBINDINGS, "handle_rename_workspace_callback: workspace_index=%d\n", *workspace_index); if (*workspace_index < 0 || *workspace_index > 36) { @@ -3659,7 +3647,6 @@ handle_rename_workspace_callback(GIOChannel *ioc, GIOCondition cond, gpointer da return FALSE; } - if (cond & (!G_IO_IN & !G_IO_PRI)) { meta_warning ("handle_rename_workspace_callback: unknown error\n"); diff --git a/src/core/keybindings.h b/src/core/keybindings.h index d5ea1afa..705678bc 100644 --- a/src/core/keybindings.h +++ b/src/core/keybindings.h @@ -41,7 +41,6 @@ #define ARROW_DOWN 116 #define ARROW_DOWN_PAD 88 - #include "display-private.h" #include "window.h" @@ -68,6 +67,3 @@ void meta_display_process_mapping_event (MetaDisplay *display, #endif - - - diff --git a/src/core/main.c b/src/core/main.c index 72542bff..19b67aff 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -489,7 +489,6 @@ main (int argc, char **argv) meta_prefs_init (); meta_prefs_add_listener (prefs_changed_callback, NULL); - #if 1 for (i=0; i<G_N_ELEMENTS(log_domains); i++) diff --git a/src/core/marco-Xatomtype.h b/src/core/marco-Xatomtype.h index 8d4df288..904f8f2b 100644 --- a/src/core/marco-Xatomtype.h +++ b/src/core/marco-Xatomtype.h @@ -34,7 +34,6 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. - Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved @@ -65,7 +64,6 @@ SOFTWARE. #define UNSIGNEDINT unsigned long #define RESOURCEID unsigned long - /* this structure may be extended, but do not change the order */ typedef struct { UNSIGNEDINT flags; @@ -98,7 +96,6 @@ typedef struct { #define OldNumPropStandardColormapElements 8 /* pre-ICCCM */ #define NumPropStandardColormapElements 10 /* ICCCM version 1 */ - /* this structure may be extended, but do not change the order */ typedef struct { UNSIGNEDINT flags; diff --git a/src/core/prefs.c b/src/core/prefs.c index 691516a5..e73324f0 100644 --- a/src/core/prefs.c +++ b/src/core/prefs.c @@ -627,7 +627,6 @@ handle_preference_init_int (void) { MetaIntPreference *cursor = preferences_int; - while (cursor->key!=NULL) { gint value; @@ -809,7 +808,6 @@ handle_preference_update_int (const gchar *key, GSettings *settings) } - /****************************************************************************/ /* Listeners. */ /****************************************************************************/ @@ -925,7 +923,6 @@ queue_changed (MetaPreference pref) changed_idle_handler, NULL, NULL); } - /****************************************************************************/ /* Initialisation. */ /****************************************************************************/ diff --git a/src/core/screen-private.h b/src/core/screen-private.h index c1552ab0..56755f9a 100644 --- a/src/core/screen-private.h +++ b/src/core/screen-private.h @@ -181,7 +181,6 @@ const MetaXineramaScreenInfo* meta_screen_get_xinerama_for_rect (MetaScreen const MetaXineramaScreenInfo* meta_screen_get_xinerama_for_window (MetaScreen *screen, MetaWindow *window); - const MetaXineramaScreenInfo* meta_screen_get_xinerama_neighbor (MetaScreen *screen, int which_xinerama, MetaScreenDirection dir); diff --git a/src/core/screen.c b/src/core/screen.c index cdf08bfd..efb65945 100644 --- a/src/core/screen.c +++ b/src/core/screen.c @@ -283,7 +283,6 @@ reload_xinerama_infos (MetaScreen *screen) "Marco compiled without Solaris Xinerama support\n"); #endif /* HAVE_SOLARIS_XINERAMA */ - /* If no Xinerama, fill in the single screen info so * we can use the field unconditionally */ @@ -685,7 +684,6 @@ meta_screen_free (MetaScreen *screen, if (screen->work_area_idle != 0) g_source_remove (screen->work_area_idle); - if (XGetGCValues (screen->display->xdisplay, screen->root_xor_gc, GCFont, @@ -881,7 +879,6 @@ prefs_changed_callback (MetaPreference pref, } } - static char* get_screen_name (MetaDisplay *display, int number) @@ -2104,7 +2101,6 @@ meta_screen_queue_workarea_recalc (MetaScreen *screen) } } - #ifdef WITH_VERBOSE_MODE static char * meta_screen_corner_to_string (MetaScreenCorner corner) @@ -2195,7 +2191,6 @@ meta_screen_calc_workspace_layout (MetaScreen *screen, * in the above grids could be missing */ - grid = g_new (int, grid_area); i = 0; @@ -2522,7 +2517,6 @@ meta_screen_show_desktop (MetaScreen *screen, windows = windows->next; } - meta_screen_update_showing_desktop_hint (screen); } @@ -2539,7 +2533,6 @@ meta_screen_unshow_desktop (MetaScreen *screen) meta_screen_update_showing_desktop_hint (screen); } - #ifdef HAVE_STARTUP_NOTIFICATION static gboolean startup_sequence_timeout (void *data); diff --git a/src/core/session.c b/src/core/session.c index ec1d3a71..5cd13b31 100644 --- a/src/core/session.c +++ b/src/core/session.c @@ -540,7 +540,6 @@ save_yourself_callback (SmcConn smc_conn, save_yourself_possibly_done (shutdown, successful); } - static void die_callback (SmcConn smc_conn, SmPointer client_data) { @@ -663,7 +662,6 @@ set_clone_restart_commands (void) } prop3.num_vals = i; - props[0] = &prop1; props[1] = &prop2; props[2] = &prop3; @@ -1120,7 +1118,6 @@ load_state (const char *previous_save_file) &error)) goto error; - error = NULL; if (!g_markup_parse_context_end_parse (context, &error)) goto error; diff --git a/src/core/session.h b/src/core/session.h index 635cf3fb..9675c339 100644 --- a/src/core/session.h +++ b/src/core/session.h @@ -81,11 +81,7 @@ void meta_window_release_saved_state (const MetaWindowSe void meta_session_init (const char *client_id, const char *save_file); - void meta_session_shutdown (void); #endif - - - diff --git a/src/core/testasyncgetprop.c b/src/core/testasyncgetprop.c index 78ccede9..f1d3a65c 100644 --- a/src/core/testasyncgetprop.c +++ b/src/core/testasyncgetprop.c @@ -170,7 +170,6 @@ atom_name (Display *display, } } - #define ELAPSED(start_time, current_time) \ (((((double)current_time.tv_sec - start_time.tv_sec) * 1000000 + \ (current_time.tv_usec - start_time.tv_usec))) / 1000.0) diff --git a/src/core/util.c b/src/core/util.c index 9e15bb26..c29901de 100644 --- a/src/core/util.c +++ b/src/core/util.c @@ -678,7 +678,6 @@ meta_show_entry_dialog(const char *message, } argvl[i] = NULL; - unsetenv ("WINDOWID"); /* start in current workspace */ g_spawn_async_with_pipes ( "/", diff --git a/src/core/window-private.h b/src/core/window-private.h index ca631966..e641e42a 100644 --- a/src/core/window-private.h +++ b/src/core/window-private.h @@ -512,7 +512,6 @@ void meta_window_resize_with_gravity (MetaWindow *window, int h, int gravity); - /* Return whether the window would be showing if we were on its workspace */ gboolean meta_window_showing_on_its_workspace (MetaWindow *window); @@ -582,7 +581,6 @@ void meta_window_send_icccm_message (MetaWindow *window, Atom atom, guint32 timestamp); - void meta_window_move_resize_request(MetaWindow *window, guint value_mask, int gravity, @@ -663,7 +661,6 @@ void meta_window_foreach_ancestor (MetaWindow *window, void *data); MetaWindow* meta_window_find_root_ancestor (MetaWindow *window); - void meta_window_begin_grab_op (MetaWindow *window, MetaGrabOp op, gboolean frame_action, diff --git a/src/core/window-props.c b/src/core/window-props.c index 54a2ecee..f0eb1c64 100644 --- a/src/core/window-props.c +++ b/src/core/window-props.c @@ -76,7 +76,6 @@ typedef struct MetaWindowPropHooks static MetaWindowPropHooks* find_hooks (MetaDisplay *display, Atom property); - void meta_window_reload_property (MetaWindow *window, Atom property, @@ -345,7 +344,6 @@ reload_net_wm_user_time_window (MetaWindow *window, NoEventMask); } - /* Obtain the new NET_WM_USER_TIME_WINDOW and register it */ window->user_time_window = value->v.xwindow; if (window->user_time_window != None) diff --git a/src/core/window-props.h b/src/core/window-props.h index 4d6840f7..9493d230 100644 --- a/src/core/window-props.h +++ b/src/core/window-props.h @@ -46,7 +46,6 @@ void meta_window_reload_property (MetaWindow *window, Atom property, gboolean initial); - /** * Requests the current values of a set of properties for a given * window from the server, and deals with them appropriately. diff --git a/src/core/window.c b/src/core/window.c index b86e6232..55594fe3 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -56,7 +56,6 @@ static int destroying_windows_disallowed = 0; - static void update_sm_hints (MetaWindow *window); static void update_net_frame_extents (MetaWindow *window); static void recalc_window_type (MetaWindow *window); @@ -91,7 +90,6 @@ static void meta_window_move_resize_internal (MetaWindow *window, static void ensure_mru_position_after (MetaWindow *window, MetaWindow *after_this_one); - static void meta_window_move_resize_now (MetaWindow *window); static void meta_window_unqueue (MetaWindow *window, guint queuebits); @@ -118,10 +116,8 @@ static void meta_window_transform_to_monitor (MetaRectangle *target_rect const MetaRectangle *from_monitor, const MetaRectangle *to_monitor); - static gboolean update_resize_timeout (gpointer data); - static void meta_window_flush_calc_showing (MetaWindow *window); static gboolean queue_calc_showing_func (MetaWindow *window, @@ -245,7 +241,6 @@ meta_window_new (MetaDisplay *display, return NULL; } - meta_error_trap_pop (display, FALSE); meta_display_ungrab (display); @@ -590,7 +585,6 @@ meta_window_new_with_attrs (MetaDisplay *display, meta_display_register_x_window (display, &window->xwindow, window); - /* assign the window to its group, or create a new group if needed */ window->group = NULL; @@ -1180,7 +1174,6 @@ meta_window_free (MetaWindow *window, meta_display_unregister_x_window (window->display, window->xwindow); - meta_error_trap_push (window->display); /* Put back anything we messed up */ @@ -2743,7 +2736,6 @@ meta_window_tile (MetaWindow *window) else meta_window_save_rect(window); - window->tiled = TRUE; /* move_resize with new tiling constraints */ @@ -2885,7 +2877,6 @@ meta_window_unmaximize (MetaWindow *window, meta_compositor_unmaximize_window (window->display->compositor, window); } - void meta_window_move_to_monitor(MetaWindow *window, const MetaXineramaScreenInfo *from_monitor, @@ -2946,8 +2937,6 @@ static void meta_window_transform_to_monitor(MetaRectangle *target_rect, } - - void meta_window_make_above (MetaWindow *window) { @@ -7465,7 +7454,6 @@ update_move (MetaWindow *window, new_y = old.y; } - /* Do any edge resistance/snapping */ meta_window_edge_resistance_for_move (window, old.x, @@ -7493,7 +7481,6 @@ update_move (MetaWindow *window, meta_window_move (window, TRUE, new_x, new_y); } - static MetaTileMode calculate_tiling_mode(int x, int y, MetaWindow *window, @@ -7535,7 +7522,6 @@ static MetaTileMode calculate_tiling_mode(int x, } - static gboolean update_resize_timeout (gpointer data) { diff --git a/src/core/workspace.c b/src/core/workspace.c index e2960a41..620184f9 100644 --- a/src/core/workspace.c +++ b/src/core/workspace.c @@ -968,7 +968,6 @@ meta_workspace_focus_default_window (MetaWorkspace *workspace, "focus window may not be correct.\n"); } - if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK || !workspace->screen->display->mouse_mode) focus_ancestor_or_top_window (workspace, not_this_one, timestamp); diff --git a/src/core/workspace.h b/src/core/workspace.h index 3af1997d..4ad4e4a1 100644 --- a/src/core/workspace.h +++ b/src/core/workspace.h @@ -97,7 +97,6 @@ GList* meta_workspace_list_windows (MetaWorkspace *workspace); void meta_workspace_invalidate_work_area (MetaWorkspace *workspace); - void meta_workspace_get_work_area_for_xinerama (MetaWorkspace *workspace, int which_xinerama, MetaRectangle *area); @@ -118,6 +117,3 @@ const char* meta_workspace_get_name (MetaWorkspace *workspace); #endif - - - diff --git a/src/core/xprops.c b/src/core/xprops.c index bd374195..5cc9b451 100644 --- a/src/core/xprops.c +++ b/src/core/xprops.c @@ -79,7 +79,6 @@ from The Open Group. */ - #include <config.h> #include "xprops.h" #include "errors.h" diff --git a/src/include/all-keybindings.h b/src/include/all-keybindings.h index cba8e9fd..992d077f 100644 --- a/src/include/all-keybindings.h +++ b/src/include/all-keybindings.h @@ -279,7 +279,6 @@ keybind (move-to-corner-sw, handle_move_to_corner_sw, 0, keybind (move-to-corner-se, handle_move_to_corner_se, 0, BINDING_PER_WINDOW) - keybind (move-to-side-n, handle_move_to_side_n, 0, BINDING_PER_WINDOW) keybind (move-to-side-s, handle_move_to_side_s, 0, @@ -300,10 +299,6 @@ keybind (move-to-monitor-e, handle_move_to_monitor, META_SCREEN_RIGHT, keybind (move-to-monitor-w, handle_move_to_monitor, META_SCREEN_LEFT, BINDING_PER_WINDOW) - - - - keybind (switch-to-workspace-prev, handle_switch_to_workspace, META_MOTION_PREV, 0) diff --git a/src/include/core.h b/src/include/core.h index 54306847..94ec7081 100644 --- a/src/include/core.h +++ b/src/include/core.h @@ -190,7 +190,6 @@ MetaGrabOp meta_core_get_grab_op (Display *xdisplay); Window meta_core_get_grab_frame (Display *xdisplay); int meta_core_get_grab_button (Display *xdisplay); - void meta_core_grab_buttons (Display *xdisplay, Window frame_xwindow); @@ -210,6 +209,3 @@ void meta_invalidate_all_icons (void); #endif - - - diff --git a/src/include/errors.h b/src/include/errors.h index ca6305c0..9282099c 100644 --- a/src/include/errors.h +++ b/src/include/errors.h @@ -45,5 +45,4 @@ void meta_error_trap_pop (MetaDisplay *display, int meta_error_trap_pop_with_return (MetaDisplay *display, gboolean last_request_was_roundtrip); - #endif diff --git a/src/include/prefs.h b/src/include/prefs.h index a7dc2508..3fbb5f57 100644 --- a/src/include/prefs.h +++ b/src/include/prefs.h @@ -265,6 +265,3 @@ MetaVisualBellType meta_prefs_get_visual_bell_type (void); #endif - - - diff --git a/src/include/util.h b/src/include/util.h index fe94bbc6..331a0b96 100644 --- a/src/include/util.h +++ b/src/include/util.h @@ -140,4 +140,3 @@ meta_show_entry_dialog (const char *message, #endif /* META_UTIL_H */ - diff --git a/src/include/xprops.h b/src/include/xprops.h index 1a93a95a..34a49d82 100644 --- a/src/include/xprops.h +++ b/src/include/xprops.h @@ -222,6 +222,3 @@ void meta_prop_free_values (MetaPropValue *values, #endif - - - diff --git a/src/tools/marco-message.c b/src/tools/marco-message.c index 723927ac..0badb82f 100644 --- a/src/tools/marco-message.c +++ b/src/tools/marco-message.c @@ -29,7 +29,6 @@ #define _(x) dgettext (GETTEXT_PACKAGE, x) #define N_(x) x - static void send_restart (void) { diff --git a/src/tools/marco-window-demo.c b/src/tools/marco-window-demo.c index efc72eeb..6b001cac 100644 --- a/src/tools/marco-window-demo.c +++ b/src/tools/marco-window-demo.c @@ -487,7 +487,6 @@ focus_in_event_cb (GtkWidget *window, return TRUE; } - static gboolean focus_out_event_cb (GtkWidget *window, GdkEvent *event, 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, |