From 09674ba9f9b9d6b6cb4b88d9fe81c30aaccef8e6 Mon Sep 17 00:00:00 2001 From: rbuj Date: Wed, 27 Oct 2021 18:02:13 +0200 Subject: Use a blank line at most --- applets/clock/clock-face.h | 1 - applets/clock/clock-location.c | 1 - applets/clock/clock-map.h | 1 - applets/clock/clock-sunpos.c | 1 - applets/clock/clock.c | 5 ----- applets/clock/system-timezone.c | 4 ---- applets/clock/system-timezone.h | 1 - applets/fish/fish.c | 1 - applets/notification_area/main.c | 3 --- applets/notification_area/main.h | 1 - applets/wncklet/showdesktop.c | 1 - applets/wncklet/showdesktop.h | 1 - applets/wncklet/wayland-backend.c | 1 - applets/wncklet/wayland-backend.h | 2 -- applets/wncklet/window-list.c | 5 ----- applets/wncklet/wncklet.c | 1 - applets/wncklet/workspace-switcher.c | 3 --- libmate-panel-applet/mate-panel-applet-factory.c | 1 - libmate-panel-applet/mate-panel-applet.c | 3 --- libmate-panel-applet/mate-panel-applet.h | 1 - libmate-panel-applet/test-dbus-applet.c | 1 - mate-panel/applet.c | 2 -- mate-panel/applet.h | 3 --- mate-panel/drawer-private.h | 3 --- mate-panel/drawer.c | 5 ----- mate-panel/drawer.h | 3 --- mate-panel/launcher.c | 3 --- mate-panel/launcher.h | 1 - mate-panel/libmate-panel-applet-private/panel-applet-container.h | 1 - mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c | 1 - mate-panel/libpanel-util/panel-gtk.c | 1 - mate-panel/libpanel-util/panel-keyfile.h | 1 - mate-panel/menu.c | 4 ---- mate-panel/menu.h | 1 - mate-panel/panel-action-button.c | 1 - mate-panel/panel-addto.c | 1 - mate-panel/panel-applet-frame.h | 1 - mate-panel/panel-background.c | 3 --- mate-panel/panel-ditem-editor.c | 1 - mate-panel/panel-frame.c | 1 - mate-panel/panel-lockdown.c | 1 - mate-panel/panel-menu-button.c | 2 -- mate-panel/panel-menu-items.c | 2 -- mate-panel/panel-menu-items.h | 4 ---- mate-panel/panel-profile.h | 2 -- mate-panel/panel-recent.c | 1 - mate-panel/panel-run-dialog.c | 1 - mate-panel/panel-stock-icons.c | 1 - mate-panel/panel-struts.c | 3 --- mate-panel/panel-test-applets.c | 2 -- mate-panel/panel-toplevel.c | 2 -- mate-panel/panel-util.c | 1 - mate-panel/panel-widget.c | 7 ------- mate-panel/panel-widget.h | 2 -- mate-panel/panel.c | 2 -- mate-panel/panel.h | 1 - 56 files changed, 110 deletions(-) diff --git a/applets/clock/clock-face.h b/applets/clock/clock-face.h index 3c665c63..00106ca4 100644 --- a/applets/clock/clock-face.h +++ b/applets/clock/clock-face.h @@ -56,7 +56,6 @@ GtkWidget *clock_face_new_with_location (ClockFaceSize size, GtkWidget *size_widget); gboolean clock_face_refresh (ClockFace *this); - #ifdef __cplusplus } #endif diff --git a/applets/clock/clock-location.c b/applets/clock/clock-location.c index e5b84bf1..67af64b1 100644 --- a/applets/clock/clock-location.c +++ b/applets/clock/clock-location.c @@ -437,7 +437,6 @@ clock_location_is_current (ClockLocation *loc) return FALSE; } - glong clock_location_get_offset (ClockLocation *loc) { diff --git a/applets/clock/clock-map.h b/applets/clock/clock-map.h index 0df4a416..d400fa9b 100644 --- a/applets/clock/clock-map.h +++ b/applets/clock/clock-map.h @@ -36,7 +36,6 @@ void clock_map_refresh (ClockMap *this); void clock_map_update_time (ClockMap *this); void clock_map_blink_location (ClockMap *this, ClockLocation *loc); - #ifdef __cplusplus } #endif diff --git a/applets/clock/clock-sunpos.c b/applets/clock/clock-sunpos.c index 20a7b619..7b3ee86a 100644 --- a/applets/clock/clock-sunpos.c +++ b/applets/clock/clock-sunpos.c @@ -170,7 +170,6 @@ sun_position (time_t unix_time, gdouble *lat, gdouble *lon) *lon = ra; } - #if 0 int main (int argc, char *argv[]) diff --git a/applets/clock/clock.c b/applets/clock/clock.c index 1b3480fe..f589c65b 100644 --- a/applets/clock/clock.c +++ b/applets/clock/clock.c @@ -1049,7 +1049,6 @@ create_cities_store (ClockData *cd) } g_slist_free (list); - if (cd->prefs_window) { GtkWidget *widget = _clock_get_widget (cd, "cities_list"); gtk_tree_view_set_model (GTK_TREE_VIEW (widget), @@ -1342,7 +1341,6 @@ force_no_button_vertical_padding (GtkWidget *widget) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); g_object_unref (provider); - gtk_widget_set_name (widget, "clock-applet-button"); } @@ -2163,7 +2161,6 @@ locations_changed (ClockData *cd) create_cities_section (cd); } - static void set_locations (ClockData *cd, GSList *locations) { @@ -3041,7 +3038,6 @@ speed_combo_changed (GtkComboBox *combo, ClockData *cd) g_settings_set_enum (cd->settings, KEY_SPEED_UNIT, value); } - static void fill_prefs_window (ClockData *cd) { @@ -3195,7 +3191,6 @@ ensure_prefs_window_is_created (ClockData *cd) location_name_label = _clock_get_widget (cd, "location-name-label"); timezone_label = _clock_get_widget (cd, "timezone-label"); - if (!clock_locale_supports_am_pm ()) gtk_widget_hide (clock_options); diff --git a/applets/clock/system-timezone.c b/applets/clock/system-timezone.c index 199756e0..801f3386 100644 --- a/applets/clock/system-timezone.c +++ b/applets/clock/system-timezone.c @@ -283,7 +283,6 @@ system_timezone_monitor_changed (GFileMonitor *handle, g_free (new_tz); } - /* * Code to deal with the system timezone on all distros. * There's no dependency on the SystemTimezone GObject here. @@ -372,7 +371,6 @@ system_timezone_write_etc_timezone (const char *tz, return retval; } - /* Read a file that looks like a key-file (but there's no need for groups) * and get the last value for a specific key */ static char * @@ -710,7 +708,6 @@ recursive_compare (struct stat *localtime_stat, return NULL; } - static gboolean files_are_identical_inode (struct stat *a_stat, struct stat *b_stat, @@ -721,7 +718,6 @@ files_are_identical_inode (struct stat *a_stat, return (a_stat->st_ino == b_stat->st_ino); } - /* Determine if /etc/localtime is a hard link to some file, by looking at * the inodes */ static char * diff --git a/applets/clock/system-timezone.h b/applets/clock/system-timezone.h index 0ede8976..8a2c22ef 100644 --- a/applets/clock/system-timezone.h +++ b/applets/clock/system-timezone.h @@ -35,7 +35,6 @@ extern "C" { #define SYSTEM_ZONEINFODIR "/usr/share/zoneinfo" #endif - #define SYSTEM_TIMEZONE_TYPE (system_timezone_get_type ()) #define SYSTEM_TIMEZONE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SYSTEM_TIMEZONE_TYPE, SystemTimezone)) #define SYSTEM_TIMEZONE_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), SYSTEM_TIMEZONE_TYPE, SystemTimezoneClass)) diff --git a/applets/fish/fish.c b/applets/fish/fish.c index ac6cdcb8..2cded044 100644 --- a/applets/fish/fish.c +++ b/applets/fish/fish.c @@ -115,7 +115,6 @@ typedef struct { MatePanelAppletClass klass; } FishAppletClass; - static gboolean load_fish_image (FishApplet *fish); static void update_pixmap (FishApplet *fish); static void something_fishy_going_on (FishApplet *fish, const char *message); diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c index 2f0dafdb..7aff4288 100644 --- a/applets/notification_area/main.c +++ b/applets/notification_area/main.c @@ -73,7 +73,6 @@ static void (*parent_class_style_updated) (GtkWidget *widget); static void (*parent_class_change_background)(MatePanelApplet* panel_applet, MatePanelAppletBackgroundType type, GdkRGBA* color, cairo_pattern_t* pattern); static void (*parent_class_change_orient)(MatePanelApplet *panel_applet, MatePanelAppletOrient orient); - #ifdef PROVIDE_WATCHER_SERVICE /* Quite dirty way of providing the org.kde.StatusNotifierWatcher service * ourselves, in case the session doesn't already */ @@ -103,7 +102,6 @@ sn_watcher_service_ref (void) } #endif - static GtkOrientation get_gtk_orientation_from_applet_orient (MatePanelAppletOrient orient) { @@ -300,7 +298,6 @@ static const GtkActionEntry menu_actions [] = { G_CALLBACK (about_cb) } }; - static void na_tray_applet_realize (GtkWidget *widget) { diff --git a/applets/notification_area/main.h b/applets/notification_area/main.h index 32041cdf..a4325ba5 100644 --- a/applets/notification_area/main.h +++ b/applets/notification_area/main.h @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - #ifndef __NA_TRAY_APPLET_H__ #define __NA_TRAY_APPLET_H__ diff --git a/applets/wncklet/showdesktop.c b/applets/wncklet/showdesktop.c index aabc1a63..b3d7a54f 100644 --- a/applets/wncklet/showdesktop.c +++ b/applets/wncklet/showdesktop.c @@ -43,7 +43,6 @@ #define TIMEOUT_ACTIVATE_SECONDS 1 #define SHOW_DESKTOP_ICON "user-desktop" - typedef struct { /* widgets */ GtkWidget* applet; diff --git a/applets/wncklet/showdesktop.h b/applets/wncklet/showdesktop.h index e82ed713..7aa7e60d 100644 --- a/applets/wncklet/showdesktop.h +++ b/applets/wncklet/showdesktop.h @@ -39,4 +39,3 @@ gboolean show_desktop_applet_fill(MatePanelApplet* applet); #endif - diff --git a/applets/wncklet/wayland-backend.c b/applets/wncklet/wayland-backend.c index a6f50a77..00d96025 100644 --- a/applets/wncklet/wayland-backend.c +++ b/applets/wncklet/wayland-backend.c @@ -268,7 +268,6 @@ foreign_toplevel_handle_closed (void *data, gtk_widget_destroy (task->button); } - static const struct zwlr_foreign_toplevel_handle_v1_listener foreign_toplevel_handle_listener = { .title = foreign_toplevel_handle_title, .app_id = foreign_toplevel_handle_app_id, diff --git a/applets/wncklet/wayland-backend.h b/applets/wncklet/wayland-backend.h index 0ea4634a..e2402236 100644 --- a/applets/wncklet/wayland-backend.h +++ b/applets/wncklet/wayland-backend.h @@ -38,11 +38,9 @@ extern "C" { GtkWidget* wayland_tasklist_new (void); void wayland_tasklist_set_orientation (GtkWidget* tasklist_widget, GtkOrientation orient); - #ifdef __cplusplus } #endif #endif /* _WNCKLET_APPLET_WAYLAND_BACKEND_H_ */ - diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c index dc36b89b..cca13b30 100644 --- a/applets/wncklet/window-list.c +++ b/applets/wncklet/window-list.c @@ -603,7 +603,6 @@ static void tasklist_update_unminimization_radio(TasklistData* tasklist) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE); } - static void move_unminimized_windows_changed(GSettings* settings, gchar* key, TasklistData* tasklist) { gboolean value; @@ -844,7 +843,6 @@ gboolean window_list_applet_fill(MatePanelApplet* applet) gtk_action_group_set_translation_domain(action_group, GETTEXT_PACKAGE); gtk_action_group_add_actions(action_group, tasklist_menu_actions, G_N_ELEMENTS(tasklist_menu_actions), tasklist); - /* disable the item of system monitor, if not exists. * example, mate-system-monitor, o gnome-system-monitor */ char* programpath; @@ -870,7 +868,6 @@ gboolean window_list_applet_fill(MatePanelApplet* applet) _system_monitor_found:; /* end of system monitor item */ - mate_panel_applet_setup_menu_from_resource (MATE_PANEL_APPLET (tasklist->applet), WNCKLET_RESOURCE_PATH "window-list-menu.xml", action_group); @@ -912,7 +909,6 @@ static void call_system_monitor(GtkAction* action, TasklistData* tasklist) } } - static void display_help_dialog(GtkAction* action, TasklistData* tasklist) { wncklet_display_help(tasklist->applet, "mate-user-guide", "windowlist", WINDOW_LIST_ICON); @@ -1026,7 +1022,6 @@ static void setup_dialog(GtkBuilder* builder, TasklistData* tasklist) { GtkWidget* button; - tasklist->wayland_info_label = WID("wayland_info_label"); tasklist->show_current_radio = WID("show_current_radio"); tasklist->show_all_radio = WID("show_all_radio"); diff --git a/applets/wncklet/wncklet.c b/applets/wncklet/wncklet.c index 67b2ae78..3b185910 100644 --- a/applets/wncklet/wncklet.c +++ b/applets/wncklet/wncklet.c @@ -148,7 +148,6 @@ static gboolean wncklet_factory(MatePanelApplet* applet, const char* iid, gpoint return retval; } - #ifdef WNCKLET_INPROCESS MATE_PANEL_APPLET_IN_PROCESS_FACTORY("WnckletFactory", PANEL_TYPE_APPLET, "WindowNavigationApplets", wncklet_factory, NULL) #else diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c index a58abce2..0e6c4afe 100644 --- a/applets/wncklet/workspace-switcher.c +++ b/applets/wncklet/workspace-switcher.c @@ -519,7 +519,6 @@ static void display_workspace_names_changed(GSettings* settings, gchar* key, Pag } } - static void all_workspaces_changed(GSettings* settings, gchar* key, PagerData* pager) { gboolean value = TRUE; /* Default value */ @@ -686,7 +685,6 @@ gboolean workspace_switcher_applet_fill(MatePanelApplet* applet) return TRUE; } - static void display_help_dialog(GtkAction* action, PagerData* pager) { wncklet_display_help(pager->applet, "mate-user-guide", "overview-workspaces", WORKSPACE_SWITCHER_ICON); @@ -998,7 +996,6 @@ static void setup_dialog(GtkBuilder* builder, PagerData* pager) if (marco_workspaces_settings != NULL) g_object_unref (marco_workspaces_settings); - /* Wrap workspaces: */ if (pager->wrap_workspaces_toggle) { diff --git a/libmate-panel-applet/mate-panel-applet-factory.c b/libmate-panel-applet/mate-panel-applet-factory.c index fb4cb549..326d742b 100644 --- a/libmate-panel-applet/mate-panel-applet-factory.c +++ b/libmate-panel-applet/mate-panel-applet-factory.c @@ -178,7 +178,6 @@ set_applet_constructor_properties (GObject *applet, } } - static void mate_panel_applet_factory_get_applet (MatePanelAppletFactory *factory, GDBusConnection *connection, diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c index c08e5cc2..15d97585 100644 --- a/libmate-panel-applet/mate-panel-applet.c +++ b/libmate-panel-applet/mate-panel-applet.c @@ -1561,7 +1561,6 @@ mate_panel_applet_handle_background (MatePanelApplet *applet) 0, PANEL_PIXMAP_BACKGROUND, NULL, pattern); - cairo_pattern_destroy (pattern); break; @@ -2008,7 +2007,6 @@ mate_panel_applet_class_init (MatePanelAppletClass *klass) widget_class->realize = mate_panel_applet_realize; widget_class->key_press_event = mate_panel_applet_key_press_event; - gobject_class->finalize = mate_panel_applet_finalize; g_object_class_install_property (gobject_class, @@ -2430,7 +2428,6 @@ _mate_panel_applet_factory_main_internal (const gchar *factory_id, g_return_val_if_fail(callback != NULL, 1); g_assert(g_type_is_a(applet_type, PANEL_TYPE_APPLET)); - #ifdef HAVE_X11 if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) { /*Use this both in and out of process as the tray applet always uses GtkSocket diff --git a/libmate-panel-applet/mate-panel-applet.h b/libmate-panel-applet/mate-panel-applet.h index 85eb0d4d..9cc48ae8 100644 --- a/libmate-panel-applet/mate-panel-applet.h +++ b/libmate-panel-applet/mate-panel-applet.h @@ -134,7 +134,6 @@ int mate_panel_applet_factory_setup_in_process (const gchar MatePanelAppletFactoryCallback callback, gpointer data); - /* * These macros are getting a bit unwieldy. * diff --git a/libmate-panel-applet/test-dbus-applet.c b/libmate-panel-applet/test-dbus-applet.c index bfd00e5e..27c3a308 100644 --- a/libmate-panel-applet/test-dbus-applet.c +++ b/libmate-panel-applet/test-dbus-applet.c @@ -202,7 +202,6 @@ test_applet_factory (TestApplet *applet, return retval; } - MATE_PANEL_APPLET_OUT_PROCESS_FACTORY ("TestAppletFactory", test_applet_get_type (), "A Test Applet for the MATE-3.0 Panel", diff --git a/mate-panel/applet.c b/mate-panel/applet.c index 2fbc7033..3f25ead1 100644 --- a/mate-panel/applet.c +++ b/mate-panel/applet.c @@ -313,7 +313,6 @@ applet_menu_show (GtkWidget *w, panel_toplevel_push_autohide_disabler (panel_widget->toplevel); } - static void applet_menu_deactivate (GtkWidget *w, AppletInfo *info) @@ -1382,6 +1381,5 @@ mate_panel_applet_lockable (AppletInfo *applet) if (panel_lockdown_get_locked_down ()) return FALSE; - return g_settings_is_writable (applet->settings, PANEL_OBJECT_LOCKED_KEY); } diff --git a/mate-panel/applet.h b/mate-panel/applet.h index 380e1f21..b7b3603b 100644 --- a/mate-panel/applet.h +++ b/mate-panel/applet.h @@ -11,7 +11,6 @@ extern "C" { #endif - #define APPLET_EVENT_MASK (GDK_BUTTON_PRESS_MASK | \ GDK_BUTTON_RELEASE_MASK | \ GDK_POINTER_MOTION_MASK | \ @@ -77,7 +76,6 @@ void mate_panel_applet_queue_applet_to_load (const char *id, void mate_panel_applet_load_queued_applets (gboolean initial_load); gboolean mate_panel_applet_on_load_queue (const char *id); - void mate_panel_applet_add_callback (AppletInfo *info, const gchar *callback_name, const gchar *stock_item, @@ -89,7 +87,6 @@ void mate_panel_applet_clear_user_menu (AppletInfo *info); AppletUserMenu *mate_panel_applet_get_callback (GList *user_menu, const gchar *name); - void mate_panel_applet_save_position (AppletInfo *applet_info, const char *id, gboolean immediate); diff --git a/mate-panel/drawer-private.h b/mate-panel/drawer-private.h index 4f300dea..b8db81f8 100644 --- a/mate-panel/drawer-private.h +++ b/mate-panel/drawer-private.h @@ -8,7 +8,6 @@ * Authors: info@cppsp.de */ - #ifndef DRAWER_PRIVATE_H #define DRAWER_PRIVATE_H @@ -16,7 +15,6 @@ extern "C" { #endif - /* Internal functions */ /* event handlers */ @@ -139,7 +137,6 @@ static void panel_drawer_prepare (const char *drawer_id, const char *tooltip, char **attached_toplevel_id); - #ifdef __cplusplus } #endif diff --git a/mate-panel/drawer.c b/mate-panel/drawer.c index ac9ce919..22d52722 100644 --- a/mate-panel/drawer.c +++ b/mate-panel/drawer.c @@ -8,7 +8,6 @@ * George Lebl */ - #include #include #include @@ -35,11 +34,9 @@ #include "panel-icon-names.h" #include "panel-schemas.h" - /* Internal functions */ /* event handlers */ - static void drawer_click (GtkWidget *widget, Drawer *drawer) @@ -449,7 +446,6 @@ create_drawer_applet (PanelToplevel *toplevel, g_signal_connect (drawer->button, "key_press_event", G_CALLBACK (key_press_drawer), drawer); g_signal_connect (drawer->toplevel, "key_press_event", G_CALLBACK (key_press_drawer_widget), drawer); - gtk_drag_dest_set (drawer->button, 0, NULL, 0, 0); g_signal_connect (drawer->button, "drag_data_get", G_CALLBACK (drag_data_get_cb), drawer); @@ -458,7 +454,6 @@ create_drawer_applet (PanelToplevel *toplevel, g_signal_connect (drawer->button, "drag_data_received", G_CALLBACK (drag_data_received_cb), drawer); g_signal_connect (drawer->button, "drag_leave", G_CALLBACK (drag_leave_cb), drawer); - g_signal_connect (drawer->button, "destroy", G_CALLBACK (destroy_drawer), drawer); g_signal_connect (drawer->toplevel, "destroy", G_CALLBACK (toplevel_destroyed), drawer); diff --git a/mate-panel/drawer.h b/mate-panel/drawer.h index 891b8dd7..04fcd0a1 100644 --- a/mate-panel/drawer.h +++ b/mate-panel/drawer.h @@ -7,7 +7,6 @@ extern "C" { #endif - typedef struct { char *tooltip; @@ -20,7 +19,6 @@ typedef struct { AppletInfo *info; } Drawer; - /* API */ void panel_drawer_create (PanelToplevel *toplevel, @@ -45,7 +43,6 @@ void panel_drawer_set_dnd_enabled (Drawer *drawer, void drawer_query_deletion (Drawer *drawer); - #ifdef __cplusplus } #endif diff --git a/mate-panel/launcher.c b/mate-panel/launcher.c index c16cc596..5ef95b21 100644 --- a/mate-panel/launcher.c +++ b/mate-panel/launcher.c @@ -326,7 +326,6 @@ drag_leave_cb(GtkWidget *widget, button_widget_set_dnd_highlight(BUTTON_WIDGET(widget), FALSE); } - static gboolean drag_motion_cb(GtkWidget *widget, GdkDragContext *context, @@ -371,7 +370,6 @@ enum { TARGET_URI_LIST }; - static void drag_data_get_cb (GtkWidget *widget, GdkDragContext *context, @@ -623,7 +621,6 @@ setup_button (Launcher *launcher) else str = g_strdup (comment); - /* If we can unescape the string, then we probably have an escaped * string (a location e.g.). If we can't, then it most probably means * we have a % that is not here to encode a character, and we don't diff --git a/mate-panel/launcher.h b/mate-panel/launcher.h index 97ebf7d5..8cfd50b9 100644 --- a/mate-panel/launcher.h +++ b/mate-panel/launcher.h @@ -74,7 +74,6 @@ void launcher_properties_destroy (Launcher *launcher); void panel_launcher_set_dnd_enabled (Launcher *launcher, gboolean dnd_enabled); - #ifdef __cplusplus } #endif diff --git a/mate-panel/libmate-panel-applet-private/panel-applet-container.h b/mate-panel/libmate-panel-applet-private/panel-applet-container.h index 60cec083..7bd967b7 100644 --- a/mate-panel/libmate-panel-applet-private/panel-applet-container.h +++ b/mate-panel/libmate-panel-applet-private/panel-applet-container.h @@ -74,7 +74,6 @@ GType mate_panel_applet_container_get_type (void) G_GNUC_CON GQuark mate_panel_applet_container_error_quark (void) G_GNUC_CONST; GtkWidget *mate_panel_applet_container_new (void); - void mate_panel_applet_container_add (MatePanelAppletContainer *container, GdkScreen *screen, const gchar *iid, diff --git a/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c b/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c index 09edf6b3..e4a04808 100644 --- a/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c +++ b/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c @@ -92,7 +92,6 @@ mate_panel_applet_frame_dbus_update_flags (MatePanelAppletFrame *frame, _mate_panel_applet_frame_update_flags (frame, major, minor, has_handle); } - static void mate_panel_applet_frame_dbus_get_flags_cb (MatePanelAppletContainer *container, GAsyncResult *res, diff --git a/mate-panel/libpanel-util/panel-gtk.c b/mate-panel/libpanel-util/panel-gtk.c index 75668323..d638d75d 100644 --- a/mate-panel/libpanel-util/panel-gtk.c +++ b/mate-panel/libpanel-util/panel-gtk.c @@ -167,7 +167,6 @@ panel_file_chooser_dialog_new (const gchar *title, return result; } - static void ensure_icon_settings (void) { diff --git a/mate-panel/libpanel-util/panel-keyfile.h b/mate-panel/libpanel-util/panel-keyfile.h index 248b843b..413ae7ec 100644 --- a/mate-panel/libpanel-util/panel-keyfile.h +++ b/mate-panel/libpanel-util/panel-keyfile.h @@ -34,7 +34,6 @@ extern "C" { #endif - GKeyFile *panel_key_file_new_desktop (void); gboolean panel_key_file_to_file (GKeyFile *keyfile, const gchar *file, diff --git a/mate-panel/menu.c b/mate-panel/menu.c index 20a13ea1..d9e750e0 100644 --- a/mate-panel/menu.c +++ b/mate-panel/menu.c @@ -212,7 +212,6 @@ add_app_to_panel (GtkWidget *item, matemenu_tree_entry_get_desktop_file_path (entry)); } - static void add_app_to_desktop (GtkWidget *item, MateMenuTreeEntry *entry) @@ -256,7 +255,6 @@ add_app_to_desktop (GtkWidget *item, } } - static void add_drawers_from_dir (MateMenuTreeDirectory *directory, int pos, const char *toplevel_id); @@ -513,7 +511,6 @@ create_item_context_menu (GtkWidget *item, gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); - submenu = create_empty_menu (); g_object_set_data (G_OBJECT (submenu), "menu_panel", panel_widget); @@ -950,7 +947,6 @@ create_fake_menu (MateMenuTreeDirectory *directory) g_signal_connect (menu, "button_press_event", G_CALLBACK (menu_dummy_button_press_event), NULL); - /* Fix any failures of compiz/other wm's to communicate with gtk for transparency */ GtkWidget *toplevel = gtk_widget_get_toplevel (menu); GdkScreen *screen = gtk_widget_get_screen(GTK_WIDGET(toplevel)); diff --git a/mate-panel/menu.h b/mate-panel/menu.h index 99d557cc..dd99e793 100644 --- a/mate-panel/menu.h +++ b/mate-panel/menu.h @@ -72,7 +72,6 @@ GtkWidget *add_menu_separator (GtkWidget *menu); gboolean menu_dummy_button_press_event (GtkWidget *menuitem, GdkEventButton *event); - #ifdef __cplusplus } #endif diff --git a/mate-panel/panel-action-button.c b/mate-panel/panel-action-button.c index 295843f4..8a040651 100644 --- a/mate-panel/panel-action-button.c +++ b/mate-panel/panel-action-button.c @@ -716,7 +716,6 @@ panel_action_button_load (PanelActionButtonType type, button = g_object_new (PANEL_TYPE_ACTION_BUTTON, "action-type", type, NULL); - button->priv->info = mate_panel_applet_register (GTK_WIDGET (button), NULL, NULL, panel, locked, position, diff --git a/mate-panel/panel-addto.c b/mate-panel/panel-addto.c index 3d5a24c3..b85d6ce8 100644 --- a/mate-panel/panel-addto.c +++ b/mate-panel/panel-addto.c @@ -1405,7 +1405,6 @@ panel_addto_dialog_new (PanelWidget *panel_widget) GINT_TO_POINTER (COLUMN_TEXT), NULL); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)); gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); diff --git a/mate-panel/panel-applet-frame.h b/mate-panel/panel-applet-frame.h index 16df013d..618d0e3d 100644 --- a/mate-panel/panel-applet-frame.h +++ b/mate-panel/panel-applet-frame.h @@ -102,7 +102,6 @@ void mate_panel_applet_frame_change_background (MatePanelAppletFrame *frame void mate_panel_applet_frame_set_panel (MatePanelAppletFrame *frame, PanelWidget *panel); - /* For module implementations only */ typedef struct _MatePanelAppletFrameActivating MatePanelAppletFrameActivating; diff --git a/mate-panel/panel-background.c b/mate-panel/panel-background.c index 0197fb5e..4ac5d589 100644 --- a/mate-panel/panel-background.c +++ b/mate-panel/panel-background.c @@ -39,7 +39,6 @@ #include "panel-util.h" - static gboolean panel_background_composite (PanelBackground *background); static void load_background_file (PanelBackground *background); @@ -244,7 +243,6 @@ panel_background_composite (PanelBackground *background) background->composited = TRUE; - panel_background_prepare (background); return TRUE; @@ -621,7 +619,6 @@ panel_background_set_default_style (PanelBackground *background, panel_background_prepare (background); } - void panel_background_realized (PanelBackground *background, GdkWindow *window) diff --git a/mate-panel/panel-ditem-editor.c b/mate-panel/panel-ditem-editor.c index 9d22e54f..ebcc91a6 100644 --- a/mate-panel/panel-ditem-editor.c +++ b/mate-panel/panel-ditem-editor.c @@ -1138,7 +1138,6 @@ panel_ditem_editor_sync_display (PanelDItemEditor *dialog) buffer ? buffer : ""); g_free (buffer); - /* Icon */ buffer = panel_key_file_get_locale_string (key_file, "Icon"); setup_icon_chooser (dialog, buffer); diff --git a/mate-panel/panel-frame.c b/mate-panel/panel-frame.c index 75e46395..414b3db4 100644 --- a/mate-panel/panel-frame.c +++ b/mate-panel/panel-frame.c @@ -176,7 +176,6 @@ panel_frame_draw (GtkWidget *widget, GtkBorder padding; int x, y, width, height; - if (edges == PANEL_EDGE_NONE) return; diff --git a/mate-panel/panel-lockdown.c b/mate-panel/panel-lockdown.c index 2ab5eebf..88cc2f16 100644 --- a/mate-panel/panel-lockdown.c +++ b/mate-panel/panel-lockdown.c @@ -50,7 +50,6 @@ typedef struct { static PanelLockdown panel_lockdown = { 0, }; - static inline void panel_lockdown_invoke_closures (PanelLockdown *lockdown) { diff --git a/mate-panel/panel-menu-button.c b/mate-panel/panel-menu-button.c index 9f02dd7e..2a35b76d 100644 --- a/mate-panel/panel-menu-button.c +++ b/mate-panel/panel-menu-button.c @@ -590,7 +590,6 @@ panel_menu_button_class_init (PanelMenuButtonClass *klass) FALSE, G_PARAM_READWRITE)); - g_object_class_install_property ( gobject_class, PROP_HAS_ARROW, @@ -916,7 +915,6 @@ panel_menu_button_set_has_arrow (PanelMenuButton *button, button_widget_set_has_arrow (BUTTON_WIDGET (button), has_arrow); } - void panel_menu_button_load_from_gsettings (PanelWidget *panel, gboolean locked, diff --git a/mate-panel/panel-menu-items.c b/mate-panel/panel-menu-items.c index 42ab4200..1cdc9284 100644 --- a/mate-panel/panel-menu-items.c +++ b/mate-panel/panel-menu-items.c @@ -983,7 +983,6 @@ panel_place_menu_item_append_remote_gio (PanelPlaceMenuItem *place_item, } g_object_unref (root); - add_mounts = g_slist_prepend (add_mounts, mount); } add_mounts = g_slist_reverse (add_mounts); @@ -1016,7 +1015,6 @@ panel_place_menu_item_append_remote_gio (PanelPlaceMenuItem *place_item, g_list_free (mounts); } - static GtkWidget * panel_place_menu_item_create_menu (PanelPlaceMenuItem *place_item) { diff --git a/mate-panel/panel-menu-items.h b/mate-panel/panel-menu-items.h index 34cfbce4..1b94a2d8 100644 --- a/mate-panel/panel-menu-items.h +++ b/mate-panel/panel-menu-items.h @@ -21,7 +21,6 @@ * Vincent Untz */ - #ifndef __PANEL_MENU_ITEMS_H__ #define __PANEL_MENU_ITEMS_H__ @@ -55,8 +54,6 @@ struct _PanelPlaceMenuItemClass { GType panel_place_menu_item_get_type (void) G_GNUC_CONST; - - #define PANEL_TYPE_DESKTOP_MENU_ITEM (panel_desktop_menu_item_get_type ()) #define PANEL_DESKTOP_MENU_ITEM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PANEL_TYPE_DESKTOP_MENU_ITEM, PanelDesktopMenuItem)) #define PANEL_DESKTOP_MENU_ITEM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), PANEL_TYPE_DESKTOP_MENU_ITEM, PanelDesktopMenuItemClass)) @@ -80,7 +77,6 @@ struct _PanelDesktopMenuItemClass { GType panel_desktop_menu_item_get_type (void) G_GNUC_CONST; - GtkWidget* panel_place_menu_item_new(gboolean use_image); GtkWidget* panel_desktop_menu_item_new(gboolean use_image, gboolean append_lock_logout); diff --git a/mate-panel/panel-profile.h b/mate-panel/panel-profile.h index 6202d6c3..36d4f217 100644 --- a/mate-panel/panel-profile.h +++ b/mate-panel/panel-profile.h @@ -44,14 +44,12 @@ const char *panel_profile_get_toplevel_id (PanelToplevel *toplevel); PanelToplevel *panel_profile_get_toplevel_by_id (const char *toplevel_id); char *panel_profile_find_new_id (PanelGSettingsKeyType type); - gboolean panel_profile_get_show_program_list (void); void panel_profile_set_show_program_list (gboolean show_program_list); gboolean panel_profile_is_writable_show_program_list (void); gboolean panel_profile_get_enable_program_list (void); gboolean panel_profile_get_enable_autocompletion (void); - void panel_profile_add_to_list (PanelGSettingsKeyType type, const char *id); void panel_profile_remove_from_list (PanelGSettingsKeyType type, diff --git a/mate-panel/panel-recent.c b/mate-panel/panel-recent.c index 195cc7a0..054430bf 100644 --- a/mate-panel/panel-recent.c +++ b/mate-panel/panel-recent.c @@ -50,7 +50,6 @@ show_uri (const char *uri, const char *mime_type, GdkScreen *screen, error); } - static void recent_documents_activate_cb (GtkRecentChooser *chooser, gpointer data) diff --git a/mate-panel/panel-run-dialog.c b/mate-panel/panel-run-dialog.c index b0f21829..9a421043 100644 --- a/mate-panel/panel-run-dialog.c +++ b/mate-panel/panel-run-dialog.c @@ -1120,7 +1120,6 @@ program_list_selection_activated (GtkTreeView *view, gtk_dialog_response (GTK_DIALOG (dialog->run_dialog), GTK_RESPONSE_OK); } - static void panel_run_dialog_setup_program_list (PanelRunDialog *dialog, GtkBuilder *gui) diff --git a/mate-panel/panel-stock-icons.c b/mate-panel/panel-stock-icons.c index 75784ccc..02a930f4 100644 --- a/mate-panel/panel-stock-icons.c +++ b/mate-panel/panel-stock-icons.c @@ -69,7 +69,6 @@ panel_init_stock_icons (GtkIconFactory *factory) GtkIconSource *source; int i; - source = gtk_icon_source_new (); for (i = 0; i < G_N_ELEMENTS (stock_icons); i++) { diff --git a/mate-panel/panel-struts.c b/mate-panel/panel-struts.c index cb45f69d..b24707ca 100644 --- a/mate-panel/panel-struts.c +++ b/mate-panel/panel-struts.c @@ -35,7 +35,6 @@ #include "panel-multimonitor.h" #include "panel-xutils.h" - typedef struct { PanelToplevel *toplevel; @@ -54,10 +53,8 @@ typedef struct { int allocated_strut_end; } PanelStrut; - static GSList *panel_struts_list = NULL; - static inline PanelStrut * panel_struts_find_strut (PanelToplevel *toplevel) { diff --git a/mate-panel/panel-test-applets.c b/mate-panel/panel-test-applets.c index 0a5598ee..3f0000e2 100644 --- a/mate-panel/panel-test-applets.c +++ b/mate-panel/panel-test-applets.c @@ -62,7 +62,6 @@ static ComboItem orient_items [] = { { NC_("Orientation", "Right"), PANEL_ORIENTATION_RIGHT } }; - static ComboItem size_items [] = { { NC_("Size", "XX Small"), 12 }, { NC_("Size", "X Small"), 24 }, @@ -241,7 +240,6 @@ setup_combo (GtkWidget *combo_box, gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), GTK_TREE_MODEL (model)); - for (i = 0; i < nb_items; i++) { gtk_list_store_append (model, &iter); gtk_list_store_set (model, &iter, diff --git a/mate-panel/panel-toplevel.c b/mate-panel/panel-toplevel.c index 477fd101..7f5c6cf6 100644 --- a/mate-panel/panel-toplevel.c +++ b/mate-panel/panel-toplevel.c @@ -530,7 +530,6 @@ static void panel_toplevel_begin_grab_op(PanelToplevel* toplevel, PanelGrabOpTyp cursor_type = panel_toplevel_grab_op_cursor ( toplevel, toplevel->priv->grab_op); - cursor = gdk_cursor_new_for_display (gdk_display_get_default (), cursor_type); display = gdk_window_get_display (window); @@ -4354,7 +4353,6 @@ panel_toplevel_class_init (PanelToplevelClass *klass) DEFAULT_SIZE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - g_object_class_install_property ( gobject_class, PROP_X, diff --git a/mate-panel/panel-util.c b/mate-panel/panel-util.c index 3e93b228..a7cd615e 100644 --- a/mate-panel/panel-util.c +++ b/mate-panel/panel-util.c @@ -486,7 +486,6 @@ void panel_lock_screen(GdkScreen* screen) panel_lock_screen_action(screen, "lock"); } - static char* panel_launcher_get_personal_path(void) { return g_build_filename(g_get_user_config_dir(), "mate", "panel2.d", "default", "launchers", NULL); diff --git a/mate-panel/panel-widget.c b/mate-panel/panel-widget.c index 4c9cd128..574d419b 100644 --- a/mate-panel/panel-widget.c +++ b/mate-panel/panel-widget.c @@ -601,7 +601,6 @@ panel_widget_cremove (GtkContainer *container, GtkWidget *widget) g_object_unref (widget); } - /*get the list item of the data on the position pos*/ static GList * get_applet_list_pos (PanelWidget *panel, @@ -1153,7 +1152,6 @@ panel_widget_push_move (PanelWidget *panel, } } - /*this is a special function and may fail if called improperly, it works only under special circumstance when we know there is nothing from old_size to panel->size*/ @@ -1604,7 +1602,6 @@ panel_widget_finalize (GObject *obj) g_free (panel->applets_using_hint); panel->applets_using_hint = NULL; - G_OBJECT_CLASS (panel_widget_parent_class)->finalize (obj); } @@ -1762,7 +1759,6 @@ panel_widget_applet_drag_start_no_grab (PanelWidget *panel, return TRUE; } - static void panel_widget_applet_drag_end_no_grab (PanelWidget *panel) { @@ -2311,7 +2307,6 @@ panel_sub_event_handler(GtkWidget *widget, GdkEvent *event, gpointer data) return FALSE; } - static void bind_applet_events(GtkWidget *widget, gpointer data) { @@ -2527,7 +2522,6 @@ panel_widget_add (PanelWidget *panel, gtk_fixed_put(GTK_FIXED(panel),applet, 0,pos); - gtk_widget_queue_resize(GTK_WIDGET(panel)); g_signal_emit (G_OBJECT(panel), @@ -2811,7 +2805,6 @@ panel_widget_focus (PanelWidget *panel_widget) gtk_widget_grab_focus (GTK_WIDGET (panel_widget)); } - PanelOrientation panel_widget_get_applet_orientation (PanelWidget *panel) { diff --git a/mate-panel/panel-widget.h b/mate-panel/panel-widget.h index 169bb652..e5dc3da8 100644 --- a/mate-panel/panel-widget.h +++ b/mate-panel/panel-widget.h @@ -11,7 +11,6 @@ #ifndef PANEL_WIDGET_H #define PANEL_WIDGET_H - #include #include #include "button-widget.h" @@ -192,7 +191,6 @@ void panel_widget_draw_all (PanelWidget *panel, void panel_widget_draw_icon (PanelWidget *panel, ButtonWidget *applet); - /*tells us if an applet is "stuck" on the right side*/ int panel_widget_is_applet_stuck (PanelWidget *panel, GtkWidget *applet); diff --git a/mate-panel/panel.c b/mate-panel/panel.c index d25103c2..d9738950 100644 --- a/mate-panel/panel.c +++ b/mate-panel/panel.c @@ -116,7 +116,6 @@ orient_change_foreach(GtkWidget *w, gpointer data) orientation_change(info,panel); } - static void panel_orient_change (GtkWidget *widget, gpointer data) { @@ -146,7 +145,6 @@ size_change_foreach(GtkWidget *w, gpointer data) size_change(info,panel); } - static void panel_size_change (GtkWidget *widget, gpointer data) { diff --git a/mate-panel/panel.h b/mate-panel/panel.h index 3cb773a6..bf1517ec 100644 --- a/mate-panel/panel.h +++ b/mate-panel/panel.h @@ -28,7 +28,6 @@ GdkScreen *panel_screen_from_panel_widget (PanelWidget *panel); gboolean panel_is_applet_right_stick (GtkWidget *applet); - gboolean panel_check_dnd_target_data (GtkWidget *widget, GdkDragContext *context, guint *ret_info, -- cgit v1.2.1