aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/table
diff options
context:
space:
mode:
Diffstat (limited to 'widgets/table')
-rw-r--r--widgets/table/ChangeLog8
-rw-r--r--widgets/table/e-table-header-item.c14
-rw-r--r--widgets/table/e-table-header-item.h6
3 files changed, 18 insertions, 10 deletions
diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog
index b46be03e1f..c8ee9919c1 100644
--- a/widgets/table/ChangeLog
+++ b/widgets/table/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-02 Damien Carbery <damien.carbery@sun.com>
+
+ ** Fixes bug #492058
+
+ * e-table-header-item.h:
+ * e-table-header-item.c: Name the anonymous unions to build
+ with the Sun Studio compiler.
+
2007-11-02 Milan Crha <mcrha@redhat.com>
** Fix for bug #463946
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 993be4c075..a477f127ae 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -142,8 +142,8 @@ ethi_dispose (GObject *object){
g_object_unref (ethi->full_header);
ethi->full_header = NULL;
- if (ethi->etfcd)
- g_object_remove_weak_pointer (G_OBJECT (ethi->etfcd), &ethi->etfcd_pointer);
+ if (ethi->etfcd.widget)
+ g_object_remove_weak_pointer (G_OBJECT (ethi->etfcd.widget), &ethi->etfcd.pointer);
if (ethi->config)
g_object_unref (ethi->config);
@@ -1359,7 +1359,7 @@ ethi_popup_remove_column(GtkWidget *widget, EthiHeaderInfo *info)
static void
ethi_popup_field_chooser(GtkWidget *widget, EthiHeaderInfo *info)
{
- GtkWidget *etfcd = info->ethi->etfcd;
+ GtkWidget *etfcd = info->ethi->etfcd.widget;
if (etfcd) {
gtk_window_present (GTK_WINDOW (etfcd));
@@ -1367,12 +1367,12 @@ ethi_popup_field_chooser(GtkWidget *widget, EthiHeaderInfo *info)
return;
}
- info->ethi->etfcd = e_table_field_chooser_dialog_new ();
- etfcd = info->ethi->etfcd;
+ info->ethi->etfcd.widget = e_table_field_chooser_dialog_new ();
+ etfcd = info->ethi->etfcd.widget;
- g_object_add_weak_pointer (G_OBJECT (etfcd), &info->ethi->etfcd_pointer);
+ g_object_add_weak_pointer (G_OBJECT (etfcd), &info->ethi->etfcd.pointer);
- g_object_set (info->ethi->etfcd,
+ g_object_set (info->ethi->etfcd.widget,
"full_header", info->ethi->full_header,
"header", info->ethi->eth,
"dnd_code", info->ethi->dnd_code,
diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h
index 50b5e3239e..fe3733bbdf 100644
--- a/widgets/table/e-table-header-item.h
+++ b/widgets/table/e-table-header-item.h
@@ -98,9 +98,9 @@ typedef struct {
void *config;
union {
- GtkWidget *etfcd;
- gpointer etfcd_pointer;
- };
+ GtkWidget *widget;
+ gpointer pointer;
+ } etfcd;
/* For keyboard navigation*/
int selected_col;