From cae22334fa6bc395ccc421b09e0af94c89297c41 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 15 Jan 2010 10:16:25 -0500 Subject: Remove dead assignments found by clang. --- widgets/misc/e-attachment-button.c | 3 --- widgets/misc/e-attachment-handler-image.c | 5 ----- widgets/misc/e-attachment-store.c | 3 --- widgets/misc/e-calendar-item.c | 13 +------------ widgets/misc/e-image-chooser.c | 2 +- widgets/misc/e-import-assistant.c | 1 - widgets/misc/e-map.c | 3 --- widgets/misc/e-pilot-settings.c | 6 ------ widgets/misc/e-web-view.c | 2 -- widgets/misc/ea-calendar-item.c | 2 -- 10 files changed, 2 insertions(+), 38 deletions(-) (limited to 'widgets/misc') diff --git a/widgets/misc/e-attachment-button.c b/widgets/misc/e-attachment-button.c index 192344068b..dac9b28c75 100644 --- a/widgets/misc/e-attachment-button.c +++ b/widgets/misc/e-attachment-button.c @@ -208,13 +208,10 @@ attachment_button_update_pixbufs (EAttachmentButton *button) { GtkCellLayout *cell_layout; GtkCellRenderer *renderer; - GtkIconTheme *icon_theme; GdkPixbuf *pixbuf_expander_open; GdkPixbuf *pixbuf_expander_closed; GList *list; - icon_theme = gtk_icon_theme_get_default (); - /* Grab the first cell renderer. */ cell_layout = GTK_CELL_LAYOUT (button->priv->cell_view); list = gtk_cell_layout_get_cells (cell_layout); diff --git a/widgets/misc/e-attachment-handler-image.c b/widgets/misc/e-attachment-handler-image.c index 277a51be7f..6429eb6b8e 100644 --- a/widgets/misc/e-attachment-handler-image.c +++ b/widgets/misc/e-attachment-handler-image.c @@ -154,7 +154,6 @@ static void attachment_handler_image_update_actions_cb (EAttachmentView *view, EAttachmentHandler *handler) { - EAttachmentHandlerImagePrivate *priv; EAttachment *attachment; GFileInfo *file_info; GtkActionGroup *action_group; @@ -163,8 +162,6 @@ attachment_handler_image_update_actions_cb (EAttachmentView *view, GList *selected; gboolean visible = FALSE; - priv = E_ATTACHMENT_HANDLER_IMAGE_GET_PRIVATE (handler); - selected = e_attachment_view_get_selected_attachments (view); if (g_list_length (selected) != 1) @@ -199,7 +196,6 @@ exit: static void attachment_handler_image_constructed (GObject *object) { - EAttachmentHandlerImagePrivate *priv; EAttachmentHandler *handler; EAttachmentView *view; GtkActionGroup *action_group; @@ -207,7 +203,6 @@ attachment_handler_image_constructed (GObject *object) GError *error = NULL; handler = E_ATTACHMENT_HANDLER (object); - priv = E_ATTACHMENT_HANDLER_IMAGE_GET_PRIVATE (object); /* Chain up to parent's constructed() method. */ G_OBJECT_CLASS (parent_class)->constructed (object); diff --git a/widgets/misc/e-attachment-store.c b/widgets/misc/e-attachment-store.c index 6fd71f0c57..217d03fd83 100644 --- a/widgets/misc/e-attachment-store.c +++ b/widgets/misc/e-attachment-store.c @@ -281,7 +281,6 @@ e_attachment_store_add_attachment (EAttachmentStore *store, GtkTreeModel *model; GtkTreePath *path; GtkTreeIter iter; - GFile *file; g_return_if_fail (E_IS_ATTACHMENT_STORE (store)); g_return_if_fail (E_IS_ATTACHMENT (attachment)); @@ -301,8 +300,6 @@ e_attachment_store_add_attachment (EAttachmentStore *store, store->priv->attachment_index, g_object_ref (attachment), reference); - file = e_attachment_get_file (attachment); - /* This lets the attachment tell us when to update. */ e_attachment_set_reference (attachment, reference); diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index 6f54327033..9829d81279 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -1023,7 +1023,6 @@ e_calendar_item_draw (GnomeCanvasItem *canvas_item, { ECalendarItem *calitem; GtkStyle *style; - GdkGC *base_gc, *bg_gc; gint char_height, row, col, row_y, bar_height, col_x; gint xthickness, ythickness; PangoFontDescription *font_desc; @@ -1052,8 +1051,6 @@ e_calendar_item_draw (GnomeCanvasItem *canvas_item, PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics)); xthickness = style->xthickness; ythickness = style->ythickness; - base_gc = style->base_gc[GTK_STATE_NORMAL]; - bg_gc = style->bg_gc[GTK_STATE_NORMAL]; base = style->base[GTK_STATE_NORMAL]; bg = style->bg[GTK_STATE_NORMAL]; @@ -1164,7 +1161,6 @@ e_calendar_item_draw_month (ECalendarItem *calitem, PangoFontMetrics *font_metrics; PangoLayout *layout; cairo_t *cr; - GdkColor fg; #if 0 g_print ("In e_calendar_item_draw_month: %i,%i %ix%i row:%i col:%i\n", @@ -1191,8 +1187,6 @@ e_calendar_item_draw_month (ECalendarItem *calitem, ythickness = style->ythickness; fg_gc = style->fg_gc[GTK_STATE_NORMAL]; - fg = style->fg[GTK_STATE_NORMAL]; - pango_font_metrics_unref (font_metrics); /* Calculate the top-left position of the entire month display. */ @@ -1396,7 +1390,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem *calitem, GnomeCanvasItem *item; GtkWidget *widget; GtkStyle *style; - PangoFontDescription *font_desc, *wkfont_desc; + PangoFontDescription *font_desc; GdkGC *fg_gc; GdkColor *bg_color, *fg_color, *box_color; struct tm today_tm; @@ -1427,9 +1421,6 @@ e_calendar_item_draw_day_numbers (ECalendarItem *calitem, font_desc = calitem->font_desc; if (!font_desc) font_desc = style->font_desc; - wkfont_desc = calitem->week_number_font_desc; - if (!wkfont_desc) - wkfont_desc = font_desc; fg_gc = style->fg_gc[GTK_STATE_NORMAL]; pango_context = gtk_widget_get_pango_context (widget); @@ -1732,8 +1723,6 @@ e_calendar_item_get_week_number (ECalendarItem *calitem, g_date_add_days (&date, 7 - weekday); else g_date_subtract_days (&date, weekday); - - weekday = g_date_get_weekday (&date) - 1; } /* Calculate the day of the year, from 0 to 365. */ diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c index 4ea76099aa..5defe2090d 100644 --- a/widgets/misc/e-image-chooser.c +++ b/widgets/misc/e-image-chooser.c @@ -401,7 +401,7 @@ image_chooser_finalize (GObject *object) static void e_image_chooser_class_init (EImageChooserClass *class) { - GObjectClass *object_class = G_OBJECT_CLASS (class); + GObjectClass *object_class; parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (EImageChooserPrivate)); diff --git a/widgets/misc/e-import-assistant.c b/widgets/misc/e-import-assistant.c index bf2396efb2..77108c01a5 100644 --- a/widgets/misc/e-import-assistant.c +++ b/widgets/misc/e-import-assistant.c @@ -168,7 +168,6 @@ filename_changed (GtkWidget *widget, first = eii; } gtk_list_store_set (GTK_LIST_STORE (model), &iter, 1, TRUE, -1); - fileok = TRUE; } else { if (page->importer == eii) page->importer = NULL; diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index 3169c97c78..e6a223a121 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -535,9 +535,6 @@ e_map_key_press (GtkWidget *widget, GdkEventKey *event) view = E_MAP (widget); priv = view->priv; - do_scroll = FALSE; - xofs = yofs = 0; - switch (event->keyval) { case GDK_Up: diff --git a/widgets/misc/e-pilot-settings.c b/widgets/misc/e-pilot-settings.c index 0327ca84ff..e2b90897a0 100644 --- a/widgets/misc/e-pilot-settings.c +++ b/widgets/misc/e-pilot-settings.c @@ -67,10 +67,6 @@ e_pilot_settings_get_type (void) static void class_init (EPilotSettingsClass *klass) { - GObjectClass *object_class; - - object_class = G_OBJECT_CLASS (klass); - parent_class = g_type_class_ref (GTK_TYPE_TABLE); } @@ -129,10 +125,8 @@ GtkWidget * e_pilot_settings_new (ESourceList *source_list) { EPilotSettings *ps; - EPilotSettingsPrivate *priv; ps = g_object_new (E_TYPE_PILOT_SETTINGS, NULL); - priv = ps->priv; build_ui (ps, source_list); diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c index 0a0e3143ef..31516bf04d 100644 --- a/widgets/misc/e-web-view.c +++ b/widgets/misc/e-web-view.c @@ -189,11 +189,9 @@ web_view_request_stream_read_cb (GInputStream *input_stream, GAsyncResult *result, EWebViewRequest *request) { - GtkHTML *html; gssize bytes_read; GError *error = NULL; - html = GTK_HTML (request->web_view); bytes_read = g_input_stream_read_finish (input_stream, result, &error); if (web_view_request_check_for_error (request, error)) diff --git a/widgets/misc/ea-calendar-item.c b/widgets/misc/ea-calendar-item.c index 17188ed66c..0946775e2d 100644 --- a/widgets/misc/ea-calendar-item.c +++ b/widgets/misc/ea-calendar-item.c @@ -1124,7 +1124,6 @@ ea_calendar_item_get_column_label (EaCalendarItem *ea_calitem, gint column, { AtkGObjectAccessible *atk_gobj; GObject *g_obj; - ECalendarItem *calitem; const gchar *abbr_name; g_return_val_if_fail (ea_calitem, FALSE); @@ -1135,7 +1134,6 @@ ea_calendar_item_get_column_label (EaCalendarItem *ea_calitem, gint column, return FALSE; /* Columns are 0 = Monday ... 6 = Sunday */ - calitem = E_CALENDAR_ITEM (g_obj); abbr_name = e_get_weekday_name (column + 1, TRUE); g_strlcpy (buffer, abbr_name, buffer_size); -- cgit