From 97adccec5d57a466b61896eeaeaae0272e8dfe76 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Thu, 10 Jun 2004 15:29:15 +0000 Subject: fixes for compiler warnings 2004-06-10 Radek Doulik * e-cell-text.c (layout_with_preedit): removed unused variable * e-tree.c (e_tree_get_item): added cast added #include * e-table-one.c (one_finalize): removed unused variable * e-table-item.c: added #include "gal/a11y/e-table/gal-a11y-e-table-item.h" for gal_a11y_e_table_item_factory_get_type prototype * e-table-header-utils.c (e_table_header_draw_button): removed unused variable * e-table-config.c (get_source_model_col_index): removed unused variable * e-table-click-to-add.c (finish_editing): added cast (etcta_event): ditto * e-cell-toggle.c: added #include "gal/a11y/e-table/gal-a11y-e-cell-registry.h" to have gal_a11y_e_cell_registry_add_cell_type prototype * e-cell-text.c (layout_with_preedit): removed unused variable (build_layout): ditto (ect_event): ditto (e_cell_text_commit_cb): ditto * e-cell-popup.c: added #include "gal/a11y/e-table/gal-a11y-e-cell-registry.h" to have gal_a11y_e_cell_registry_add_cell_type prototype svn path=/trunk/; revision=26284 --- widgets/table/e-cell-popup.c | 1 + widgets/table/e-cell-text.c | 5 ----- widgets/table/e-cell-toggle.c | 1 + widgets/table/e-table-click-to-add.c | 9 +++++---- widgets/table/e-table-config.c | 2 +- widgets/table/e-table-header-utils.c | 1 - widgets/table/e-table-item.c | 1 + widgets/table/e-table-one.c | 2 -- widgets/table/e-tree.c | 3 ++- 9 files changed, 11 insertions(+), 14 deletions(-) diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c index eeeabc7995..50943d6004 100644 --- a/widgets/table/e-cell-popup.c +++ b/widgets/table/e-cell-popup.c @@ -34,6 +34,7 @@ #include "e-table-item.h" #include "e-cell-popup.h" #include "gal/a11y/e-table/gal-a11y-e-cell-popup.h" +#include "gal/a11y/e-table/gal-a11y-e-cell-registry.h" #define E_CELL_POPUP_ARROW_WIDTH 16 #define E_CELL_POPUP_ARROW_XPAD 3 diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 0b80b42534..ecb9117e1c 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -494,8 +494,6 @@ build_attr_list (ECellTextView *text_view, int row, int text_length) static PangoLayout * layout_with_preedit (ECellTextView *text_view, int row, const char *text, gint width) { - ECellView *ecell_view = (ECellView *) text_view; - ECellText *ect = E_CELL_TEXT (ecell_view->ecell); CellEdit *edit = text_view->edit; PangoAttrList *attrs ; PangoLayout *layout; @@ -559,7 +557,6 @@ build_layout (ECellTextView *text_view, int row, const char *text, gint width) ECellText *ect = E_CELL_TEXT (ecell_view->ecell); PangoAttrList *attrs ; PangoLayout *layout; - gboolean bold, strikeout, underline; layout = gtk_widget_create_pango_layout (GTK_WIDGET (((GnomeCanvasItem *)ecell_view->e_table_item_view)->canvas), text); @@ -876,7 +873,6 @@ static gint ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions) { ECellTextView *text_view = (ECellTextView *) ecell_view; - ECellText *ect = (ECellText *) ((ECellView *)text_view)->ecell; ETextEventProcessorEvent e_tep_event; gboolean edit_display = FALSE; gint preedit_len; @@ -1784,7 +1780,6 @@ e_cell_text_commit_cb (GtkIMContext *context, ECellTextView *tv) { CellEdit *edit = tv->edit; - ECellText *ect = (ECellText *) ((ECellView *)tv)->ecell; ETextEventProcessorCommand command; if (g_utf8_validate (str, strlen (str), NULL)) { diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c index de113488e3..f334c3f6ca 100644 --- a/widgets/table/e-cell-toggle.c +++ b/widgets/table/e-cell-toggle.c @@ -33,6 +33,7 @@ #include "gal/widgets/e-hsv-utils.h" #include "e-table-item.h" #include "gal/a11y/e-table/gal-a11y-e-cell-toggle.h" +#include "gal/a11y/e-table/gal-a11y-e-cell-registry.h" #define PARENT_TYPE e_cell_get_type () diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c index 8fb151bc24..c02e3b8869 100644 --- a/widgets/table/e-table-click-to-add.c +++ b/widgets/table/e-table-click-to-add.c @@ -28,6 +28,7 @@ #include #include #include +#include #include "e-table-header.h" #include "e-table-click-to-add.h" @@ -312,7 +313,7 @@ finish_editing (ETableClickToAdd *etcta) e_table_item_leave_edit (E_TABLE_ITEM (etcta->row)); e_table_one_commit(E_TABLE_ONE(etcta->one)); etcta_drop_one (etcta); - gtk_object_destroy(etcta->row); + gtk_object_destroy(GTK_OBJECT (etcta->row)); etcta->row = NULL; one = e_table_one_new(etcta->model); @@ -354,11 +355,11 @@ etcta_event (GnomeCanvasItem *item, GdkEvent *e) case GDK_BUTTON_PRESS: if (etcta->text) { - gtk_object_destroy(etcta->text); + gtk_object_destroy(GTK_OBJECT (etcta->text)); etcta->text = NULL; } if (etcta->rect) { - gtk_object_destroy(etcta->rect); + gtk_object_destroy(GTK_OBJECT (etcta->rect)); etcta->rect = NULL; } if (!etcta->row) { @@ -545,7 +546,7 @@ e_table_click_to_add_commit (ETableClickToAdd *etcta) if (etcta->row) { e_table_one_commit(E_TABLE_ONE(etcta->one)); etcta_drop_one (etcta); - gtk_object_destroy(etcta->row); + gtk_object_destroy(GTK_OBJECT (etcta->row)); etcta->row = NULL; } if (!etcta->rect) { diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index 415354949c..0e08db571a 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -643,7 +643,7 @@ connect_button (ETableConfig *config, GladeXML *gui, const char *widget_name, GC static gint get_source_model_col_index (ETableConfig *config, gint idx) { - gint visible_index, result; + gint visible_index; ETableModel *src_model = E_TABLE_SUBSET (config->available_model)->source; visible_index = e_table_subset_view_to_model_row (E_TABLE_SUBSET (config->available_model), idx); diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c index 57a850f91d..cf99e8ecba 100644 --- a/widgets/table/e-table-header-utils.c +++ b/widgets/table/e-table-header-utils.c @@ -341,7 +341,6 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol, int inner_x, inner_y; int inner_width, inner_height; GdkGC *gc; - char *text; PangoLayout *layout; g_return_if_fail (drawable != NULL); diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 89e11e896a..a582502b7b 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -39,6 +39,7 @@ #include #include "e-table-subset.h" #include "e-cell.h" +#include "gal/a11y/e-table/gal-a11y-e-table-item-factory.h" #include "gal/widgets/e-hsv-utils.h" #include "gal/widgets/e-canvas.h" #include "gal/widgets/e-canvas-utils.h" diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c index 123b45712d..486f14862f 100644 --- a/widgets/table/e-table-one.c +++ b/widgets/table/e-table-one.c @@ -134,8 +134,6 @@ one_value_to_string (ETableModel *etm, int col, const void *value) static void one_finalize (GObject *object) { - ETableOne *one = E_TABLE_ONE (object); - G_OBJECT_CLASS (parent_class)->finalize (object); } diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index fc684c5f61..83fe8ad9a6 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -2159,7 +2160,7 @@ e_tree_get_item(ETree * et) g_return_val_if_fail (et != NULL, NULL); g_return_val_if_fail (E_IS_TREE (et), NULL); - return et->priv->item; + return E_TABLE_ITEM (et->priv->item); } -- cgit