aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2007-10-10 12:54:36 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2007-10-10 12:54:36 +0800
commitb32649a94cd485f742d2ad5f1b76d7385393e137 (patch)
tree002248795c141c992667d73fbf34c40f394fbbf0 /shell
parent6a2861c3aa49e9439d3e665b0855222716add3a3 (diff)
downloadgsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.tar
gsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.tar.gz
gsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.tar.bz2
gsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.tar.lz
gsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.tar.xz
gsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.tar.zst
gsoc2013-evolution-b32649a94cd485f742d2ad5f1b76d7385393e137.zip
** Fixes bug #437579
2007-10-09 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #437579 * addressbook/conduit/address-conduit.c: * addressbook/gui/component/addressbook-config.c: * addressbook/gui/contact-editor/e-contact-editor.c: * addressbook/gui/widgets/eab-gui-util.c: * calendar/conduits/calendar/calendar-conduit.c: * calendar/conduits/memo/memo-conduit.c: * calendar/conduits/todo/todo-conduit.c: * calendar/gui/dialogs/alarm-dialog.c: * calendar/gui/dialogs/event-page.c: * calendar/gui/dialogs/memo-page.c: * calendar/gui/dialogs/task-page.c: * calendar/gui/e-day-view-layout.c: * calendar/gui/e-day-view-layout.h: * calendar/gui/print.c: * e-util/e-pilot-map.c: * e-util/e-plugin.c: * e-util/e-profile-event.c: * e-util/e-signature.c: * filter/filter-file.c: * mail/e-searching-tokenizer.c: * mail/em-folder-browser.c: * mail/em-format-html.c: * mail/em-format-view.c: * mail/em-format.c: * mail/em-mailer-prefs.c: * mail/em-mailer-prefs.h: * mail/mail-session.c: * mail/mail-session.h: * mail/mail-vfolder.c: * mail/message-list.c: * plugins/bbdb/bbdb.c: * plugins/bbdb/gaimbuddies.c: * plugins/calendar-http/calendar-http.c: * plugins/exchange-operations/exchange-user-dialog.c: * plugins/face/face.c: * shell/e-shell-window.c: * shell/e-shell.c: * smime/lib/e-cert-db.c: * tools/killev.c: * widgets/misc/e-cursors.c: * widgets/misc/e-spinner.c: * widgets/misc/e-unicode.c: * widgets/table/e-table-field-chooser-item.c: * widgets/table/e-table-header-item.c: * widgets/table/e-table-header-item.h: * widgets/table/e-table-header-utils.c: * widgets/table/e-table.c: * widgets/text/e-text.c: Fix various compiler warnings. Patch from Milan Crha. svn path=/trunk/; revision=34368
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog8
-rw-r--r--shell/e-shell-window.c9
-rw-r--r--shell/e-shell.c7
3 files changed, 19 insertions, 5 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 6ff701574d..2738ec117a 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-09 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #437579
+
+ * e-shell.c:
+ * e-shell-window.c:
+ Fix various compiler warnings. Patch from Milan Crha.
+
2007-10-03 Matthew Barnes <mbarnes@redhat.com>
* e-shell-window-commands.c (command_about):
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index b97138b8fd..14a1a439a2 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -88,7 +88,10 @@ typedef struct _ComponentView ComponentView;
struct _EShellWindowPrivate {
- EShell *shell;
+ union {
+ EShell *shell;
+ gpointer shell_pointer;
+ };
EShellView *shell_view; /* CORBA wrapper for this, just a placeholder */
@@ -869,7 +872,7 @@ impl_dispose (GObject *object)
priv->destroyed = TRUE;
if (priv->shell != NULL) {
- g_object_remove_weak_pointer (G_OBJECT (priv->shell), (void **) &priv->shell);
+ g_object_remove_weak_pointer (G_OBJECT (priv->shell), &priv->shell_pointer);
priv->shell = NULL;
}
@@ -1052,7 +1055,7 @@ e_shell_window_new (EShell *shell,
}
window->priv->shell = shell;
- g_object_add_weak_pointer (G_OBJECT (shell), (void **) &window->priv->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(). */
diff --git a/shell/e-shell.c b/shell/e-shell.c
index a5617a909a..2dec47b734 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -98,7 +98,10 @@ struct _EShellPrivate {
EvolutionListener *line_status_listener;
/* Settings Dialog */
- GtkWidget *settings_dialog;
+ union {
+ GtkWidget *settings_dialog;
+ gpointer settings_dialog_pointer;
+ };
/* If we're quitting and things are still busy, a timeout handler */
guint quit_timeout;
@@ -1257,7 +1260,7 @@ e_shell_show_settings (EShell *shell,
if (type != NULL)
e_shell_settings_dialog_show_type (E_SHELL_SETTINGS_DIALOG (priv->settings_dialog), type);
- g_object_add_weak_pointer (G_OBJECT (priv->settings_dialog), (void **) & priv->settings_dialog);
+ g_object_add_weak_pointer (G_OBJECT (priv->settings_dialog), &priv->settings_dialog_pointer);
gtk_window_set_transient_for (GTK_WINDOW (priv->settings_dialog), GTK_WINDOW (shell_window));
gtk_widget_show (priv->settings_dialog);