diff options
Diffstat (limited to 'widgets')
| -rw-r--r-- | widgets/misc/ChangeLog | 6 | ||||
| -rw-r--r-- | widgets/misc/e-filter-bar.c | 3 | ||||
| -rw-r--r-- | widgets/misc/e-multi-config-dialog.c | 3 | ||||
| -rw-r--r-- | widgets/table/ChangeLog | 6 | ||||
| -rw-r--r-- | widgets/table/e-cell-checkbox.c | 3 | ||||
| -rw-r--r-- | widgets/table/e-table-header-item.c | 2 |
6 files changed, 18 insertions, 5 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index b63c41fac9..ce2c894193 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,9 @@ +2007-03-27 Matthew Barnes <mbarnes@redhat.com> + + * e-filter-bar.c: + * e-multi-config-dialog.c: + Don't mix declarations and code (#405495). + 2007-03-20 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #419524 diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index 1e15a8b539..f755ac8dba 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -269,6 +269,7 @@ menubar_activated (ESearchBar *esb, int id, void *data) if (id >= efb->menu_base && id < efb->menu_base + efb->menu_rules->len) { #if d(!)0 GString *out = g_string_new (""); + GtkStyle *style; printf("Selected rule: %s\n", ((FilterRule *)efb->menu_rules->pdata[id - efb->menu_base])->name); filter_rule_build_code (efb->menu_rules->pdata[id - efb->menu_base], out); @@ -282,7 +283,7 @@ menubar_activated (ESearchBar *esb, int id, void *data) efb->setquery = FALSE; /* saved searches activated */ - GtkStyle *style = gtk_widget_get_default_style (); + style = gtk_widget_get_default_style (); efb->setquery = TRUE; gtk_widget_modify_base (esb->entry , GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED] )); gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, &(style->text [GTK_STATE_SELECTED] )); diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c index 60f9256705..fef0a507a9 100644 --- a/widgets/misc/e-multi-config-dialog.c +++ b/widgets/misc/e-multi-config-dialog.c @@ -389,6 +389,7 @@ e_multi_config_dialog_add_page (EMultiConfigDialog *dialog, { EMultiConfigDialogPrivate *priv; AtkObject *a11y; + AtkObject *a11yPage; gint page_no; g_return_if_fail (E_IS_MULTI_CONFIG_DIALOG (dialog)); @@ -411,7 +412,7 @@ e_multi_config_dialog_add_page (EMultiConfigDialog *dialog, NULL); a11y = gtk_widget_get_accessible (GTK_WIDGET(priv->notebook)); - AtkObject *a11yPage = atk_object_ref_accessible_child (a11y, page_no); + a11yPage = atk_object_ref_accessible_child (a11y, page_no); if (a11yPage != NULL) { if (atk_object_get_role (a11yPage) == ATK_ROLE_PAGE_TAB) atk_object_set_name (a11yPage, title); diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog index ee35f6e2e7..9601d05e64 100644 --- a/widgets/table/ChangeLog +++ b/widgets/table/ChangeLog @@ -1,5 +1,11 @@ 2007-03-20 Matthew Barnes <mbarnes@redhat.com> + * e-cell-checkbox.c: + * e-table-header-item.c: + Don't mix declarations and code (#405495). + +2007-03-20 Matthew Barnes <mbarnes@redhat.com> + ** Fixes part of bug #419524 * Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>. diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c index 33135b5b71..8f3c8083fe 100644 --- a/widgets/table/e-cell-checkbox.c +++ b/widgets/table/e-cell-checkbox.c @@ -43,8 +43,7 @@ ecc_print (ECellView *ecell_view, GtkPrintContext *context, int model_col, int view_col, int row, double width, double height) { - cairo_t *cr; - cr = gtk_print_context_get_cairo_context (context); + cairo_t *cr = gtk_print_context_get_cairo_context (context); const int value = GPOINTER_TO_INT ( e_table_model_value_at (ecell_view->e_table_model, model_col, row)); cairo_save (cr); diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 15890b17b7..707d2baaa4 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -1514,7 +1514,7 @@ ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event) { EthiHeaderInfo *info = g_new(EthiHeaderInfo, 1); ETableCol *col; - GtkMenu *popup, *sub_menu;; + GtkMenu *popup, *sub_menu; int ncol, sort_count, sort_col; GtkWidget *menu_item; GSList *group = NULL; |