diff options
30 files changed, 0 insertions, 92 deletions
diff --git a/capplets/about-me/e-image-chooser.c b/capplets/about-me/e-image-chooser.c index d03adeb2..945877f8 100644 --- a/capplets/about-me/e-image-chooser.c +++ b/capplets/about-me/e-image-chooser.c @@ -214,7 +214,6 @@ e_image_chooser_dispose (GObject *object) priv = e_image_chooser_get_instance_private (E_IMAGE_CHOOSER (object)); - if (priv->image_buf) { g_free (priv->image_buf); priv->image_buf = NULL; @@ -224,7 +223,6 @@ e_image_chooser_dispose (GObject *object) (* G_OBJECT_CLASS (e_image_chooser_parent_class)->dispose) (object); } - static gboolean set_image_from_data (EImageChooser *chooser, char *data, int length) diff --git a/capplets/about-me/mate-about-me-password.c b/capplets/about-me/mate-about-me-password.c index d03655a4..3b9fce9d 100644 --- a/capplets/about-me/mate-about-me-password.c +++ b/capplets/about-me/mate-about-me-password.c @@ -289,7 +289,6 @@ free_passwd_resources (PasswordDialog *pdialog) pdialog->backend_child_watch_id = 0; } - /* Close IO channels (internal file descriptors are automatically closed) */ if (pdialog->backend_stdin != NULL) { @@ -345,7 +344,6 @@ free_passwd_resources (PasswordDialog *pdialog) pdialog->backend_stderr_watch_id = 0; } - /* Close PID */ if (pdialog->backend_pid != -1) { diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c index 98bc04d1..d9381818 100644 --- a/capplets/appearance/appearance-desktop.c +++ b/capplets/appearance/appearance-desktop.c @@ -46,7 +46,6 @@ static const GtkTargetEntry drag_types[] = { {"text/uri-list", GTK_TARGET_OTHER_WIDGET, TARGET_URI_LIST} }; - static void wp_update_preview(GtkFileChooser* chooser, AppearanceData* data); static void select_item(AppearanceData* data, MateWPItem* item, gboolean scroll) diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c index a4283b4f..c353f0e6 100644 --- a/capplets/appearance/appearance-style.c +++ b/capplets/appearance/appearance-style.c @@ -511,7 +511,6 @@ update_cursor_size_scale (MateThemeCursorInfo *theme, adjustment = gtk_range_get_adjustment (range); g_object_set (adjustment, "upper", (gdouble) theme->sizes->len - 1, NULL); - /* fallback if the gsettings value is bigger than all available sizes; use the largest we have */ index = theme->sizes->len - 1; diff --git a/capplets/appearance/mate-wp-item.c b/capplets/appearance/mate-wp-item.c index 1b0566ff..8c75e7d6 100644 --- a/capplets/appearance/mate-wp-item.c +++ b/capplets/appearance/mate-wp-item.c @@ -263,7 +263,6 @@ GdkPixbuf * mate_wp_item_get_frame_thumbnail (MateWPItem * item, return pixbuf; } - GdkPixbuf * mate_wp_item_get_thumbnail (MateWPItem * item, MateDesktopThumbnailFactory * thumbs, gint width, diff --git a/capplets/common/gtkrc-utils.c b/capplets/common/gtkrc-utils.c index b78cbb25..4b5ac0e1 100644 --- a/capplets/common/gtkrc-utils.c +++ b/capplets/common/gtkrc-utils.c @@ -176,7 +176,6 @@ void gtkrc_get_details(gchar* filename, GSList** engines, GSList** symbolic_colo g_scanner_destroy (scanner); } - gchar * gtkrc_get_color_scheme (const gchar *gtkrc_file) { diff --git a/capplets/common/mate-theme-info.c b/capplets/common/mate-theme-info.c index 6971602e..1294b7d2 100644 --- a/capplets/common/mate-theme-info.c +++ b/capplets/common/mate-theme-info.c @@ -88,7 +88,6 @@ typedef struct { gint priority; } CallbackTuple; - /* Hash tables */ /* The hashes_by_dir are indexed by an escaped uri of the common_theme_dir that @@ -1020,7 +1019,6 @@ add_common_theme_dir_monitor (GFile *theme_dir_uri, monitor_data->common_theme_dir_handle = monitor; - /* gtk-2 theme subdir */ subdir = g_file_get_child (theme_dir_uri, "gtk-2.0"); uri = g_file_get_child (subdir, "gtkrc"); diff --git a/capplets/common/theme-thumbnail.c b/capplets/common/theme-thumbnail.c index 2c1957ce..8c92d386 100644 --- a/capplets/common/theme-thumbnail.c +++ b/capplets/common/theme-thumbnail.c @@ -19,7 +19,6 @@ #include "gtkrc-utils.h" #include "capplet-util.h" - typedef struct { gboolean set; gint thumbnail_width; @@ -33,7 +32,6 @@ typedef struct { guint watch_id; } ThemeThumbnailAsyncData; - static ThemeThumbnailAsyncData async_data; /* Protocol */ @@ -89,7 +87,6 @@ static int pipe_from_factory_fd[2]; #define MARCO_THUMBNAIL_WIDTH 120 #define MARCO_THUMBNAIL_HEIGHT 60 - static void pixbuf_apply_mask_region(GdkPixbuf* pixbuf, cairo_region_t* region) { gint nchannels, rowstride, w, h; @@ -102,7 +99,6 @@ static void pixbuf_apply_mask_region(GdkPixbuf* pixbuf, cairo_region_t* region) rowstride = gdk_pixbuf_get_rowstride (pixbuf); pixels = gdk_pixbuf_get_pixels (pixbuf); - /* we need an alpha channel ... */ if (!gdk_pixbuf_get_has_alpha (pixbuf) || nchannels != 4) return; @@ -408,7 +404,6 @@ create_marco_theme_pixbuf (ThemeThumbnailData *theme_thumbnail_data) pixbuf_apply_mask_region (pixbuf, region); cairo_region_destroy (region); - retval = gdk_pixbuf_scale_simple (pixbuf, MARCO_THUMBNAIL_WIDTH, MARCO_THUMBNAIL_HEIGHT, @@ -427,7 +422,6 @@ create_icon_theme_pixbuf (ThemeThumbnailData *theme_thumbnail_data) return create_folder_icon ((char *) theme_thumbnail_data->icon_theme_name->data); } - static void handle_bytes (const guint8 *buffer, gint bytes_read, diff --git a/capplets/default-applications/mate-da-capplet.c b/capplets/default-applications/mate-da-capplet.c index e0e13d34..89154d37 100644 --- a/capplets/default-applications/mate-da-capplet.c +++ b/capplets/default-applications/mate-da-capplet.c @@ -34,7 +34,6 @@ #include "mate-da-capplet.h" #include "capplet-util.h" - enum { DA_TYPE_WEB_BROWSER, DA_TYPE_EMAIL, diff --git a/capplets/display/xrandr-capplet.c b/capplets/display/xrandr-capplet.c index 91a87235..03d9842e 100644 --- a/capplets/display/xrandr-capplet.c +++ b/capplets/display/xrandr-capplet.c @@ -964,7 +964,6 @@ realign_outputs_after_resolution_change (App *app, MateRROutputInfo *output_that else if (output_x + output_width == old_right_edge) output_x = x + width - output_width; - if (output_y >= old_bottom_edge) output_y += dy; else if (output_y + output_height == old_bottom_edge) @@ -1811,7 +1810,6 @@ paint_output (App *app, - x - (w * scale + 0.5) / 2, - y - (h * scale + 0.5) / 2); - cairo_rectangle (cr, x, y, w * scale + 0.5, h * scale + 0.5); cairo_clip_preserve (cr); diff --git a/capplets/keybindings/eggcellrendererkeys.c b/capplets/keybindings/eggcellrendererkeys.c index 162f385c..4e61ce41 100644 --- a/capplets/keybindings/eggcellrendererkeys.c +++ b/capplets/keybindings/eggcellrendererkeys.c @@ -22,7 +22,6 @@ static GtkCellEditable *egg_cell_renderer_keys_start_editing (GtkCellRenderer const GdkRectangle *cell_area, GtkCellRendererState flags); - static void egg_cell_renderer_keys_get_property (GObject *object, guint param_id, GValue *value, @@ -39,7 +38,6 @@ static void egg_cell_renderer_keys_get_size (GtkCellRenderer *cell, gint *width, gint *height); - enum { PROP_0, @@ -205,7 +203,6 @@ egg_cell_renderer_keys_class_init (EggCellRendererKeysClass *cell_keys_class) G_TYPE_STRING); } - GtkCellRenderer* egg_cell_renderer_keys_new(void) { return GTK_CELL_RENDERER(g_object_new(EGG_TYPE_CELL_RENDERER_KEYS, NULL)); diff --git a/capplets/keybindings/mate-keybinding-properties.c b/capplets/keybindings/mate-keybinding-properties.c index fbf911fb..44bdf9e3 100644 --- a/capplets/keybindings/mate-keybinding-properties.c +++ b/capplets/keybindings/mate-keybinding-properties.c @@ -633,8 +633,6 @@ append_keys_to_tree (GtkBuilder *builder, g_warning ("No description for key '%s'", key_string); } - - if (keys_list[j].cmd_key != NULL) { command = g_settings_get_string (settings, keys_list[j].cmd_key); @@ -1405,7 +1403,6 @@ description_edited_callback (GtkCellRendererText *renderer, key_entry->desc_editable = FALSE; } - typedef struct { GtkTreeView *tree_view; diff --git a/capplets/keyboard/mate-keyboard-properties-xkblt.c b/capplets/keyboard/mate-keyboard-properties-xkblt.c index b5ee38e7..12943d53 100644 --- a/capplets/keyboard/mate-keyboard-properties-xkblt.c +++ b/capplets/keyboard/mate-keyboard-properties-xkblt.c @@ -35,7 +35,6 @@ #include "capplet-util.h" #include "mate-keyboard-properties-xkb.h" - #define SEL_LAYOUT_TREE_COL_DESCRIPTION 0 #define SEL_LAYOUT_TREE_COL_ID 1 #define SEL_LAYOUT_TREE_COL_ENABLED 2 diff --git a/capplets/keyboard/mate-keyboard-properties-xkbltadd.c b/capplets/keyboard/mate-keyboard-properties-xkbltadd.c index 2d1e5dd6..723f29fa 100644 --- a/capplets/keyboard/mate-keyboard-properties-xkbltadd.c +++ b/capplets/keyboard/mate-keyboard-properties-xkbltadd.c @@ -49,15 +49,6 @@ typedef struct { } AddVariantData; static void - - - - - - - - - xkb_layout_chooser_available_layouts_fill (GtkBuilder * chooser_dialog, const gchar cblid[], const gchar cbvid[], @@ -67,28 +58,10 @@ xkb_layout_chooser_available_layouts_fill (GtkBuilder * chooser_dialog, GCallback combo_changed_notify); static void - - - - - - - - - xkb_layout_chooser_available_language_variants_fill (GtkBuilder * chooser_dialog); static void - - - - - - - - - xkb_layout_chooser_available_country_variants_fill (GtkBuilder * chooser_dialog); @@ -378,8 +351,6 @@ xkb_layout_strv_from_gslist (GSList *list) return (gchar **) array->data; } - - static void xkl_layout_chooser_add_default_switcher_if_necessary (GSList * layouts_list) diff --git a/capplets/keyboard/mate-keyboard-properties.c b/capplets/keyboard/mate-keyboard-properties.c index 8b96bff5..474aa124 100644 --- a/capplets/keyboard/mate-keyboard-properties.c +++ b/capplets/keyboard/mate-keyboard-properties.c @@ -181,7 +181,6 @@ main (int argc, char **argv) { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL } }; - context = g_option_context_new (_("- MATE Keyboard Preferences")); g_option_context_add_main_entries (context, cap_options, GETTEXT_PACKAGE); diff --git a/capplets/mouse/mate-mouse-properties.c b/capplets/mouse/mate-mouse-properties.c index 2e9a1408..3008bd7e 100644 --- a/capplets/mouse/mate-mouse-properties.c +++ b/capplets/mouse/mate-mouse-properties.c @@ -283,7 +283,6 @@ setup_dialog (GtkBuilder *dialog) g_settings_bind (interface_settings, "gtk-enable-primary-paste", WID ("middle_button_paste_toggle"), "active", G_SETTINGS_BIND_DEFAULT); - /* Double-click time */ g_settings_bind (mouse_settings, DOUBLE_CLICK_KEY, gtk_range_get_adjustment (GTK_RANGE (WID ("delay_scale"))), "value", @@ -427,7 +426,6 @@ main (int argc, char **argv) G_CALLBACK (capplet_notebook_scroll_event_cb), NULL); - if (start_page != NULL) { gchar *page_name; diff --git a/capplets/time-admin/src/time-map.c b/capplets/time-admin/src/time-map.c index d297b54c..8becefa4 100644 --- a/capplets/time-admin/src/time-map.c +++ b/capplets/time-admin/src/time-map.c @@ -249,7 +249,6 @@ convert_latitude_to_y (gdouble latitude, gdouble map_height) return y; } - static void draw_text_bubble (cairo_t *cr, GtkWidget *widget, @@ -465,7 +464,6 @@ button_press_event (TimezoneMap *map, x = event->x; y = event->y; - rowstride = map->visible_map_rowstride; pixels = map->visible_map_pixels; @@ -474,7 +472,6 @@ button_press_event (TimezoneMap *map, b = pixels[(rowstride * y + x * 4) + 2]; a = pixels[(rowstride * y + x * 4) + 3]; - for (i = 0; color_codes[i].offset != -100; i++) { if (color_codes[i].red == r && color_codes[i].green == g @@ -534,7 +531,6 @@ timezone_map_class_init (TimezoneMapClass *klass) widget_class->draw = cc_timezone_map_draw; widget_class->state_flags_changed = cc_timezone_map_state_flags_changed; - signals[LOCATION_CHANGED] = g_signal_new ("location-changed", TYPE_TIMEZONE_MAP, G_SIGNAL_RUN_FIRST, diff --git a/capplets/time-admin/src/time-zone.c b/capplets/time-admin/src/time-zone.c index e6168535..4e96c558 100644 --- a/capplets/time-admin/src/time-zone.c +++ b/capplets/time-admin/src/time-zone.c @@ -507,7 +507,6 @@ void SetupTimezoneDialog(TimeAdmin *ta) Vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_style_context_add_class (gtk_widget_get_style_context (Vbox), "linked"); - TimeZoneFrame = CreateZoneFrame(ta); Scrolled = CreateZoneScrolled(ta); gtk_container_add (GTK_CONTAINER (TimeZoneFrame), Scrolled); diff --git a/font-viewer/font-model.c b/font-viewer/font-model.c index 4cc0cd4f..8e3b4dea 100644 --- a/font-viewer/font-model.c +++ b/font-viewer/font-model.c @@ -588,7 +588,6 @@ font_view_model_init (FontViewModel *self) font_view_model_sort_func, NULL, NULL); - self->priv->fallback_icon = get_fallback_icon (); g_idle_add (ensure_font_list_idle, self); diff --git a/font-viewer/font-view.c b/font-viewer/font-view.c index 995e2021..826369d9 100644 --- a/font-viewer/font-view.c +++ b/font-viewer/font-view.c @@ -402,7 +402,6 @@ install_button_clicked_cb (GtkButton *button, dest_file = g_file_get_child (dest_location, dest_filename); g_free (dest_filename); - /* TODO: show error dialog if file exists */ g_file_copy_async (self->font_file, dest_file, G_FILE_COPY_NONE, 0, NULL, NULL, NULL, font_install_finished_cb, self); diff --git a/libslab/app-resizer.c b/libslab/app-resizer.c index f32ab85e..299e48f9 100644 --- a/libslab/app-resizer.c +++ b/libslab/app-resizer.c @@ -28,7 +28,6 @@ static gboolean app_resizer_paint_window (GtkWidget * widget, cairo_t * cr, AppS G_DEFINE_TYPE (AppResizer, app_resizer, GTK_TYPE_LAYOUT); - static void app_resizer_class_init (AppResizerClass * klass) { diff --git a/libslab/application-tile.c b/libslab/application-tile.c index 2127222b..8492a923 100644 --- a/libslab/application-tile.c +++ b/libslab/application-tile.c @@ -130,7 +130,6 @@ application_tile_new_full (const gchar *desktop_item_id, MateDesktopItem *desktop_item; - desktop_item = load_desktop_item_from_unknown (desktop_item_id); if ( @@ -405,7 +404,6 @@ create_header (const gchar *name) { GtkWidget *header; - header = gtk_label_new (name); gtk_label_set_line_wrap (GTK_LABEL (header), TRUE); gtk_label_set_xalign (GTK_LABEL (header), 0.0); @@ -424,7 +422,6 @@ create_subheader (const gchar *desc) { GtkWidget *subheader; - subheader = gtk_label_new (desc); gtk_label_set_ellipsize (GTK_LABEL (subheader), PANGO_ELLIPSIZE_END); gtk_label_set_xalign (GTK_LABEL (subheader), 0.0); @@ -474,7 +471,6 @@ add_to_user_list (ApplicationTile *this) BookmarkItem *item; - item = g_new0 (BookmarkItem, 1); item->uri = TILE (this)->uri; item->mime_type = "application/x-desktop"; @@ -608,7 +604,6 @@ update_user_list_menu_item (ApplicationTile *this) TileAction *action; GtkWidget *item; - if (priv->agent_status == BOOKMARK_STORE_ABSENT) { if (TILE (this)->actions [APPLICATION_TILE_ACTION_UPDATE_MAIN_MENU]) g_object_unref (TILE (this)->actions [APPLICATION_TILE_ACTION_UPDATE_MAIN_MENU]); diff --git a/libslab/bookmark-agent.c b/libslab/bookmark-agent.c index b37616ff..31834bd1 100644 --- a/libslab/bookmark-agent.c +++ b/libslab/bookmark-agent.c @@ -245,7 +245,6 @@ bookmark_agent_remove_item (BookmarkAgent *this, const gchar *uri) gint rank_i; gint i; - g_return_if_fail (priv->user_modifiable); if (! bookmark_agent_has_item (this, uri)) @@ -287,7 +286,6 @@ bookmark_agent_reorder_items (BookmarkAgent *this, const gchar **uris) gint i; - g_return_if_fail (priv->reorderable); for (i = 0; uris && uris [i]; ++i) @@ -578,7 +576,6 @@ get_property (GObject *g_obj, guint prop_id, GValue *value, GParamSpec *pspec) BookmarkAgent *this = BOOKMARK_AGENT (g_obj); BookmarkAgentPrivate *priv = bookmark_agent_get_instance_private (this); - switch (prop_id) { case PROP_ITEMS: g_value_set_pointer (value, priv->items); @@ -604,7 +601,6 @@ finalize (GObject *g_obj) gint i; - for (i = 0; priv->items && priv->items [i]; ++i) bookmark_item_free (priv->items [i]); @@ -666,7 +662,6 @@ update_items (BookmarkAgent *this) gint i; - uris = g_bookmark_file_get_uris (priv->store, & n_uris); uris_ordered = g_new0 (gchar *, n_uris + 1); uris_ordered [n_uris] = NULL; @@ -762,7 +757,6 @@ save_store (BookmarkAgent *this) gchar *dir; - g_return_if_fail (priv->user_modifiable); priv->needs_sync = TRUE; @@ -786,7 +780,6 @@ get_rank (BookmarkAgent *this, const gchar *uri) gint i; - if (! priv->reorderable) return -1; @@ -819,7 +812,6 @@ set_rank (BookmarkAgent *this, const gchar *uri, gint rank) gint i; - if (! (priv->reorderable && bookmark_agent_has_item (this, uri))) return; @@ -944,7 +936,6 @@ find_package_data_file (const gchar *filename) gchar *path = NULL; gint i; - dirs = g_get_system_data_dirs (); for (i = 0; ! path && dirs && dirs [i]; ++i) { diff --git a/libslab/libslab-utils.c b/libslab/libslab-utils.c index 27612262..5ee4d09c 100644 --- a/libslab/libslab-utils.c +++ b/libslab/libslab-utils.c @@ -21,7 +21,6 @@ libslab_mate_desktop_item_new_from_unknown_id (const gchar *id) GError *error = NULL; - if (! id) return NULL; diff --git a/libslab/slab-mate-util.c b/libslab/slab-mate-util.c index 2eb55209..b036de18 100644 --- a/libslab/slab-mate-util.c +++ b/libslab/slab-mate-util.c @@ -32,7 +32,6 @@ load_desktop_item_from_unknown (const gchar *id) GError *error = NULL; - item = mate_desktop_item_new_from_uri (id, 0, &error); if (! error) diff --git a/libwindow-settings/marco-window-manager.c b/libwindow-settings/marco-window-manager.c index 74b872c0..720b161c 100644 --- a/libwindow-settings/marco-window-manager.c +++ b/libwindow-settings/marco-window-manager.c @@ -41,7 +41,6 @@ #define MARCO_COMPOSITING_MANAGER_KEY "compositing-manager" #define MARCO_COMPOSITING_FAST_ALT_TAB_KEY "compositing-fast-alt-tab" - /* keep following enums in sync with marco */ enum { @@ -451,7 +450,6 @@ marco_window_manager_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - static void marco_window_manager_class_init (MarcoWindowManagerClass *class) { @@ -501,4 +499,3 @@ marco_window_manager_get_type (void) return marco_window_manager_type; } - diff --git a/libwindow-settings/mate-window-manager.c b/libwindow-settings/mate-window-manager.c index c7bbd24a..ece2e7d3 100644 --- a/libwindow-settings/mate-window-manager.c +++ b/libwindow-settings/mate-window-manager.c @@ -188,7 +188,6 @@ mate_window_manager_class_init (MateWindowManagerClass *class) parent_class = g_type_class_peek_parent (class); - signals[SETTINGS_CHANGED] = g_signal_new ("settings_changed", G_OBJECT_CLASS_TYPE (class), @@ -199,7 +198,6 @@ mate_window_manager_class_init (MateWindowManagerClass *class) G_TYPE_NONE, 0); } - GType mate_window_manager_get_type (void) { @@ -228,7 +226,6 @@ mate_window_manager_get_type (void) return mate_window_manager_type; } - void mate_window_manager_settings_changed (MateWindowManager *wm) { diff --git a/typing-break/drw-break-window.c b/typing-break/drw-break-window.c index 768a9656..74c2c6b6 100644 --- a/typing-break/drw-break-window.c +++ b/typing-break/drw-break-window.c @@ -241,7 +241,6 @@ drw_break_window_init (DrwBreakWindow *window) gtk_box_pack_start (GTK_BOX (hbox), priv->break_label, FALSE, FALSE, 12); - priv->clock_label = gtk_label_new (NULL); gtk_widget_show (priv->clock_label); gtk_box_pack_start (GTK_BOX (vbox), priv->clock_label, TRUE, TRUE, 8); diff --git a/typing-break/drw-monitor.c b/typing-break/drw-monitor.c index 8c309194..bd103a48 100644 --- a/typing-break/drw-monitor.c +++ b/typing-break/drw-monitor.c @@ -49,7 +49,6 @@ enum { LAST_SIGNAL }; - static void drw_monitor_class_init (DrwMonitorClass *klass); static void drw_monitor_init (DrwMonitor *monitor); static void drw_monitor_finalize (GObject *object); @@ -58,7 +57,6 @@ static gboolean drw_monitor_setup (DrwMonitor *monitor); static GObjectClass *parent_class; static guint signals[LAST_SIGNAL] = { 0 }; - GType drw_monitor_get_type (void) { diff --git a/typing-break/drw-selection.c b/typing-break/drw-selection.c index 7b5b05ca..31454401 100644 --- a/typing-break/drw-selection.c +++ b/typing-break/drw-selection.c @@ -110,7 +110,6 @@ drw_selection_claim (DrwSelection *drw_selection) g_signal_connect (drw_selection->invisible, "selection-clear-event", G_CALLBACK (drw_selection_clear), drw_selection); - if (gtk_selection_owner_set (drw_selection->invisible, gdk_atom_intern (SELECTION_NAME, FALSE), GDK_CURRENT_TIME)) { |