aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/e-itip-control.c94
-rw-r--r--shell/ChangeLog8
-rw-r--r--shell/e-shell-window.c38
-rw-r--r--shell/e-shell.c28
-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
8 files changed, 113 insertions, 90 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e28d93943c..296ff4f5da 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-02 Damien Carbery <damien.carbery@sun.com>
+
+ ** Fixes bug #492058
+
+ * gui/e-itip-control.c: Name the anonymous unions to build
+ with the Sun Studio compiler.
+
2007-10-31 Matthew Barnes <mbarnes@redhat.com>
* gui/alarm-notify/alarm-notify.glade:
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 69598568a6..3ba297b893 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -74,17 +74,17 @@ struct _EItipControlPrivate {
/* Use the gpointer variants for weak pointers. */
union {
- GtkWidget *ok;
- gpointer ok_pointer;
- };
+ GtkWidget *widget;
+ gpointer pointer;
+ } ok;
union {
- GtkWidget *hbox;
- gpointer hbox_pointer;
- };
+ GtkWidget *widget;
+ gpointer pointer;
+ } hbox;
union {
- GtkWidget *vbox;
- gpointer vbox_pointer;
- };
+ GtkWidget *widget;
+ gpointer pointer;
+ } vbox;
char *vcalendar;
ECalComponent *comp;
@@ -143,13 +143,13 @@ set_ok_sens (EItipControl *itip)
priv = itip->priv;
- if (!priv->ok)
+ if (!priv->ok.widget)
return;
if (priv->current_ecal)
e_cal_is_read_only (priv->current_ecal, &read_only, NULL);
- gtk_widget_set_sensitive (priv->ok, priv->current_ecal != NULL && !read_only);
+ gtk_widget_set_sensitive (priv->ok.widget, priv->current_ecal != NULL && !read_only);
}
static void
@@ -243,8 +243,8 @@ source_changed_cb (ESourceComboBox *escb, EItipControl *itip)
source = e_source_combo_box_get_active (escb);
- if (priv->ok)
- gtk_widget_set_sensitive (priv->ok, FALSE);
+ if (priv->ok.widget)
+ gtk_widget_set_sensitive (priv->ok.widget, FALSE);
start_calendar_server (itip, source, priv->type, cal_opened_cb, itip);
}
@@ -282,7 +282,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
cleanup:
if (fd->count == 0) {
- if (fd->show_selector && !priv->current_ecal && priv->vbox) {
+ if (fd->show_selector && !priv->current_ecal && priv->vbox.widget) {
GtkWidget *escb;
char *uid;
@@ -312,7 +312,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
escb, "changed",
G_CALLBACK (source_changed_cb), fd->itip, 0);
- gtk_box_pack_start (GTK_BOX (priv->vbox), escb, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (priv->vbox.widget), escb, FALSE, TRUE, 0);
gtk_widget_show (escb);
/* FIXME What if there is no source? */
@@ -2209,16 +2209,16 @@ insert_boxes (GtkHTMLEmbedded *eb, EItipControl *itip)
priv = itip->priv;
- priv->vbox = gtk_vbox_new (FALSE, 12);
- g_object_add_weak_pointer (G_OBJECT (priv->vbox), &priv->vbox_pointer);
- gtk_container_add (GTK_CONTAINER (eb), priv->vbox);
- gtk_widget_show (priv->vbox);
+ priv->vbox.widget = gtk_vbox_new (FALSE, 12);
+ g_object_add_weak_pointer (G_OBJECT (priv->vbox.widget), &priv->vbox.pointer);
+ gtk_container_add (GTK_CONTAINER (eb), priv->vbox.widget);
+ gtk_widget_show (priv->vbox.widget);
- priv->hbox = gtk_hbox_new (FALSE, 6);
- g_object_add_weak_pointer (G_OBJECT (priv->hbox), &priv->hbox_pointer);
+ priv->hbox.widget = gtk_hbox_new (FALSE, 6);
+ g_object_add_weak_pointer (G_OBJECT (priv->hbox.widget), &priv->hbox.pointer);
- gtk_box_pack_start (GTK_BOX (priv->vbox), priv->hbox, FALSE, TRUE, 0);
- gtk_widget_show (priv->hbox);
+ gtk_box_pack_start (GTK_BOX (priv->vbox.widget), priv->hbox.widget, FALSE, TRUE, 0);
+ gtk_widget_show (priv->hbox.widget);
}
static void
@@ -2272,15 +2272,15 @@ insert_ok (GtkWidget *hbox, EItipControl *itip)
EItipControlPrivate *priv;
priv = itip->priv;
- priv->ok = gtk_button_new_from_stock (GTK_STOCK_OK);
- g_object_add_weak_pointer (G_OBJECT (priv->ok), &priv->ok_pointer);
+ priv->ok.widget = gtk_button_new_from_stock (GTK_STOCK_OK);
+ g_object_add_weak_pointer (G_OBJECT (priv->ok.widget), &priv->ok.pointer);
- g_signal_connect (priv->ok, "clicked", G_CALLBACK (ok_clicked_cb), itip);
+ g_signal_connect (priv->ok.widget, "clicked", G_CALLBACK (ok_clicked_cb), itip);
set_ok_sens (itip);
- gtk_box_pack_start (GTK_BOX (hbox), priv->ok, FALSE, TRUE, 0);
- gtk_widget_show (priv->ok);
+ gtk_box_pack_start (GTK_BOX (hbox), priv->ok.widget, FALSE, TRUE, 0);
+ gtk_widget_show (priv->ok.widget);
}
static gboolean
@@ -2292,7 +2292,7 @@ publish_options_object (EItipControl *itip, GtkHTML *html, GtkHTMLEmbedded *eb)
priv = itip->priv;
insert_boxes (eb, itip);
- insert_label (priv->hbox);
+ insert_label (priv->hbox.widget);
option = gtk_option_menu_new ();
@@ -2303,10 +2303,10 @@ publish_options_object (EItipControl *itip, GtkHTML *html, GtkHTMLEmbedded *eb)
gtk_option_menu_set_menu (GTK_OPTION_MENU (option), menu);
- gtk_box_pack_start (GTK_BOX (priv->hbox), option, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (priv->hbox.widget), option, FALSE, TRUE, 0);
gtk_widget_show (option);
- insert_ok (priv->hbox, itip);
+ insert_ok (priv->hbox.widget, itip);
return TRUE;
}
@@ -2320,7 +2320,7 @@ request_options_object (EItipControl *itip, GtkHTML *html, GtkHTMLEmbedded *eb)
priv = itip->priv;
insert_boxes (eb, itip);
- insert_label (priv->hbox);
+ insert_label (priv->hbox.widget);
option = gtk_option_menu_new ();
@@ -2333,11 +2333,11 @@ request_options_object (EItipControl *itip, GtkHTML *html, GtkHTMLEmbedded *eb)
gtk_option_menu_set_menu (GTK_OPTION_MENU (option), menu);
- gtk_box_pack_start (GTK_BOX (priv->hbox), option, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (priv->hbox.widget), option, FALSE, TRUE, 0);
gtk_widget_show (option);
- insert_rsvp (priv->hbox, itip);
- insert_ok (priv->hbox, itip);
+ insert_rsvp (priv->hbox.widget, itip);
+ insert_ok (priv->hbox.widget, itip);
return TRUE;
}
@@ -2351,7 +2351,7 @@ freebusy_options_object (EItipControl *itip, GtkHTML *html, GtkHTMLEmbedded *eb)
priv = itip->priv;
insert_boxes (eb, itip);
- insert_label (priv->hbox);
+ insert_label (priv->hbox.widget);
option = gtk_option_menu_new ();
@@ -2362,10 +2362,10 @@ freebusy_options_object (EItipControl *itip, GtkHTML *html, GtkHTMLEmbedded *eb)
gtk_option_menu_set_menu (GTK_OPTION_MENU (option), menu);
- gtk_container_add (GTK_CONTAINER (priv->hbox), option);
+ gtk_container_add (GTK_CONTAINER (priv->hbox.widget), option);
gtk_widget_show (option);
- insert_ok (priv->hbox, itip);
+ insert_ok (priv->hbox.widget, itip);
return TRUE;
}
@@ -2379,7 +2379,7 @@ reply_options_object (EItipControl *itip, GtkHTML *html, GtkHTMLEmbedded *eb)
priv = itip->priv;
insert_boxes (eb, itip);
- insert_label (priv->hbox);
+ insert_label (priv->hbox.widget);
option = gtk_option_menu_new ();
@@ -2390,10 +2390,10 @@ reply_options_object (EItipControl *itip, GtkHTML *html, GtkHTMLEmbedded *eb)
gtk_option_menu_set_menu (GTK_OPTION_MENU (option), menu);
- gtk_container_add (GTK_CONTAINER (priv->hbox), option);
+ gtk_container_add (GTK_CONTAINER (priv->hbox.widget), option);
gtk_widget_show (option);
- insert_ok (priv->hbox, itip);
+ insert_ok (priv->hbox.widget, itip);
return TRUE;
}
@@ -2407,7 +2407,7 @@ refresh_options_object (EItipControl *itip, GtkHTML *html, GtkHTMLEmbedded *eb)
priv = itip->priv;
insert_boxes (eb, itip);
- insert_label (priv->hbox);
+ insert_label (priv->hbox.widget);
option = gtk_option_menu_new ();
@@ -2418,10 +2418,10 @@ refresh_options_object (EItipControl *itip, GtkHTML *html, GtkHTMLEmbedded *eb)
gtk_option_menu_set_menu (GTK_OPTION_MENU (option), menu);
- gtk_container_add (GTK_CONTAINER (priv->hbox), option);
+ gtk_container_add (GTK_CONTAINER (priv->hbox.widget), option);
gtk_widget_show (option);
- insert_ok (priv->hbox, itip);
+ insert_ok (priv->hbox.widget, itip);
return TRUE;
}
@@ -2435,7 +2435,7 @@ cancel_options_object (EItipControl *itip, GtkHTML *html, GtkHTMLEmbedded *eb)
priv = itip->priv;
insert_boxes (eb, itip);
- insert_label (priv->hbox);
+ insert_label (priv->hbox.widget);
option = gtk_option_menu_new ();
@@ -2446,10 +2446,10 @@ cancel_options_object (EItipControl *itip, GtkHTML *html, GtkHTMLEmbedded *eb)
gtk_option_menu_set_menu (GTK_OPTION_MENU (option), menu);
- gtk_container_add (GTK_CONTAINER (priv->hbox), option);
+ gtk_container_add (GTK_CONTAINER (priv->hbox.widget), option);
gtk_widget_show (option);
- insert_ok (priv->hbox, itip);
+ insert_ok (priv->hbox.widget, itip);
return TRUE;
}
diff --git a/shell/ChangeLog b/shell/ChangeLog
index a372766cef..403b50949c 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-02 Damien Carbery <damien.carbery@sun.com>
+
+ ** Fixes bug #492058
+
+ * e-shell-window.c:
+ * e-shell.c: Name the anonymous unions to build with the Sun
+ Studio compiler.
+
2007-11-01 Matthew Barnes <mbarnes@redhat.com>
* e-shell-window-commands.c:
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 094d090419..a76183c7f6 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -89,9 +89,9 @@ typedef struct _ComponentView ComponentView;
struct _EShellWindowPrivate {
union {
- EShell *shell;
- gpointer shell_pointer;
- };
+ EShell *eshell;
+ gpointer pointer;
+ } shell;
EShellView *shell_view; /* CORBA wrapper for this, just a placeholder */
@@ -220,7 +220,7 @@ init_view (EShellWindow *window,
ComponentView *view)
{
EShellWindowPrivate *priv = window->priv;
- EComponentRegistry *registry = e_shell_peek_component_registry (window->priv->shell);
+ EComponentRegistry *registry = e_shell_peek_component_registry (window->priv->shell.eshell);
GNOME_Evolution_Component component_iface;
GNOME_Evolution_ComponentView component_view;
Bonobo_UIContainer container;
@@ -320,7 +320,7 @@ switch_view (EShellWindow *window, ComponentView *component_view)
{
EShellWindowPrivate *priv = window->priv;
GConfClient *gconf_client = gconf_client_get_default ();
- EComponentRegistry *registry = e_shell_peek_component_registry (window->priv->shell);
+ EComponentRegistry *registry = e_shell_peek_component_registry (window->priv->shell.eshell);
EComponentInfo *info = e_component_registry_peek_info (registry,
ECR_FIELD_ID,
component_view->component_id);
@@ -376,7 +376,7 @@ update_offline_toggle_status (EShellWindow *window)
priv = window->priv;
- switch (e_shell_get_line_status (priv->shell)) {
+ switch (e_shell_get_line_status (priv->shell.eshell)) {
case E_SHELL_LINE_STATUS_ONLINE:
icon_pixmap = online_pixmap;
icon_mask = online_mask;
@@ -417,7 +417,7 @@ update_offline_toggle_status (EShellWindow *window)
static void
update_send_receive_sensitivity (EShellWindow *window)
{
- if (e_shell_get_line_status (window->priv->shell) == E_SHELL_LINE_STATUS_OFFLINE)
+ if (e_shell_get_line_status (window->priv->shell.eshell) == E_SHELL_LINE_STATUS_OFFLINE)
bonobo_ui_component_set_prop (window->priv->ui_component,
"/commands/SendReceive",
"sensitive", "0", NULL);
@@ -467,7 +467,7 @@ sidebar_button_pressed_callback (ESidebar *sidebar,
ComponentView *component_view;
if ((component_view = get_component_view (window, button_id))) {
- e_shell_create_window (window->priv->shell,
+ e_shell_create_window (window->priv->shell.eshell,
component_view->component_id,
window);
}
@@ -482,12 +482,12 @@ offline_toggle_clicked_callback (GtkButton *button,
{
EShellWindowPrivate *priv = window->priv;
- switch (e_shell_get_line_status (priv->shell)) {
+ switch (e_shell_get_line_status (priv->shell.eshell)) {
case E_SHELL_LINE_STATUS_ONLINE:
- e_shell_go_offline (priv->shell, window, GNOME_Evolution_USER_OFFLINE);
+ e_shell_go_offline (priv->shell.eshell, window, GNOME_Evolution_USER_OFFLINE);
break;
case E_SHELL_LINE_STATUS_OFFLINE:
- e_shell_go_online (priv->shell, window, GNOME_Evolution_USER_ONLINE);
+ e_shell_go_online (priv->shell.eshell, window, GNOME_Evolution_USER_ONLINE);
break;
default:
g_return_if_reached();
@@ -679,7 +679,7 @@ static void
setup_widgets (EShellWindow *window)
{
EShellWindowPrivate *priv = window->priv;
- EComponentRegistry *registry = e_shell_peek_component_registry (priv->shell);
+ EComponentRegistry *registry = e_shell_peek_component_registry (priv->shell.eshell);
GConfClient *gconf_client = gconf_client_get_default ();
GtkWidget *contents_vbox;
GSList *p;
@@ -871,9 +871,9 @@ impl_dispose (GObject *object)
priv->destroyed = TRUE;
- if (priv->shell != NULL) {
- g_object_remove_weak_pointer (G_OBJECT (priv->shell), &priv->shell_pointer);
- priv->shell = NULL;
+ if (priv->shell.eshell != NULL) {
+ g_object_remove_weak_pointer (G_OBJECT (priv->shell.eshell), &priv->shell.pointer);
+ priv->shell.eshell = NULL;
}
if (priv->ui_component != NULL) {
@@ -1054,8 +1054,8 @@ e_shell_window_new (EShell *shell,
return NULL;
}
- window->priv->shell = shell;
- g_object_add_weak_pointer (G_OBJECT (shell), &window->priv->shell_pointer);
+ window->priv->shell.eshell = shell;
+ g_object_add_weak_pointer (G_OBJECT (shell), &window->priv->shell.pointer);
/* FIXME TODO: Add system_exception signal handling and all the other
stuff from e_shell_view_construct(). */
@@ -1163,7 +1163,7 @@ e_shell_window_peek_shell (EShellWindow *window)
{
g_return_val_if_fail (E_IS_SHELL_WINDOW (window), NULL);
- return window->priv->shell;
+ return window->priv->shell.eshell;
}
@@ -1258,7 +1258,7 @@ e_shell_window_show_settings (EShellWindow *window)
{
g_return_if_fail (E_IS_SHELL_WINDOW (window));
- e_shell_show_settings (window->priv->shell, window->priv->current_view ? window->priv->current_view->component_alias : NULL, window);
+ e_shell_show_settings (window->priv->shell.eshell, window->priv->current_view ? window->priv->current_view->component_alias : NULL, window);
}
void
diff --git a/shell/e-shell.c b/shell/e-shell.c
index fdc8e6a15d..0fdf766903 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -99,9 +99,9 @@ struct _EShellPrivate {
/* Settings Dialog */
union {
- GtkWidget *settings_dialog;
- gpointer settings_dialog_pointer;
- };
+ GtkWidget *widget;
+ gpointer pointer;
+ } settings_dialog;
/* If we're quitting and things are still busy, a timeout handler */
guint quit_timeout;
@@ -454,9 +454,9 @@ impl_dispose (GObject *object)
/* No unreffing for these as they are aggregate. */
/* bonobo_object_unref (BONOBO_OBJECT (priv->corba_storage_registry)); */
- if (priv->settings_dialog != NULL) {
- gtk_widget_destroy (priv->settings_dialog);
- priv->settings_dialog = NULL;
+ if (priv->settings_dialog.widget != NULL) {
+ gtk_widget_destroy (priv->settings_dialog.widget);
+ priv->settings_dialog.widget = NULL;
}
if (priv->line_status_listener) {
@@ -1249,21 +1249,21 @@ e_shell_show_settings (EShell *shell,
priv = shell->priv;
- if (priv->settings_dialog != NULL) {
- gdk_window_show (priv->settings_dialog->window);
- gtk_widget_grab_focus (priv->settings_dialog);
+ if (priv->settings_dialog.widget != NULL) {
+ gdk_window_show (priv->settings_dialog.widget->window);
+ gtk_widget_grab_focus (priv->settings_dialog.widget);
return;
}
- priv->settings_dialog = e_shell_settings_dialog_new ();
+ priv->settings_dialog.widget = e_shell_settings_dialog_new ();
if (type != NULL)
- e_shell_settings_dialog_show_type (E_SHELL_SETTINGS_DIALOG (priv->settings_dialog), type);
+ e_shell_settings_dialog_show_type (E_SHELL_SETTINGS_DIALOG (priv->settings_dialog.widget), type);
- g_object_add_weak_pointer (G_OBJECT (priv->settings_dialog), &priv->settings_dialog_pointer);
+ g_object_add_weak_pointer (G_OBJECT (priv->settings_dialog.widget), &priv->settings_dialog.pointer);
- gtk_window_set_transient_for (GTK_WINDOW (priv->settings_dialog), GTK_WINDOW (shell_window));
- gtk_widget_show (priv->settings_dialog);
+ gtk_window_set_transient_for (GTK_WINDOW (priv->settings_dialog.widget), GTK_WINDOW (shell_window));
+ gtk_widget_show (priv->settings_dialog.widget);
}
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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 21:31:47 +0800