[evolution] Fix compiler warnings.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Fix compiler warnings.
- Date: Sat, 15 Dec 2012 13:16:50 +0000 (UTC)
commit 6fecc5899ecbfb700b2dd7fc866fa037c3fcfe04
Author: Matthew Barnes <mbarnes redhat com>
Date: Sat Dec 15 07:13:57 2012 -0500
Fix compiler warnings.
calendar/gui/dialogs/event-page.c | 6 +++---
calendar/gui/dialogs/memo-page.c | 4 ++--
calendar/gui/dialogs/task-page.c | 8 ++++----
e-util/e-attachment-view.c | 4 ++--
e-util/e-send-options.c | 2 +-
mail/e-mail-migrate.c | 1 -
modules/calendar/e-calendar-preferences.c | 4 ++--
shell/main.c | 4 ++++
8 files changed, 18 insertions(+), 15 deletions(-)
---
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 793e98e..c12b7c7 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -3602,9 +3602,9 @@ event_page_construct (EventPage *epage,
/* Make sure our custom widget classes are registered with
* GType before we load the GtkBuilder definition file. */
- E_TYPE_DATE_EDIT;
- E_TYPE_TIMEZONE_ENTRY;
- E_TYPE_SPELL_ENTRY;
+ g_type_ensure (E_TYPE_DATE_EDIT);
+ g_type_ensure (E_TYPE_TIMEZONE_ENTRY);
+ g_type_ensure (E_TYPE_SPELL_ENTRY);
priv->builder = gtk_builder_new ();
e_load_ui_builder_definition (priv->builder, "event-page.ui");
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 79b659a..d6f9d93 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -1240,8 +1240,8 @@ memo_page_construct (MemoPage *mpage)
/* Make sure our custom widget classes are registered with
* GType before we load the GtkBuilder definition file. */
- E_TYPE_DATE_EDIT;
- E_TYPE_SPELL_ENTRY;
+ g_type_ensure (E_TYPE_DATE_EDIT);
+ g_type_ensure (E_TYPE_SPELL_ENTRY);
priv->builder = gtk_builder_new ();
e_load_ui_builder_definition (priv->builder, "memo-page.ui");
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index d8d64f3..b832433 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -2156,10 +2156,10 @@ task_page_construct (TaskPage *tpage,
/* Make sure our custom widget classes are registered with
* GType before we load the GtkBuilder definition file. */
- E_TYPE_DATE_EDIT;
- E_TYPE_TIMEZONE_ENTRY;
- E_TYPE_SOURCE_COMBO_BOX;
- E_TYPE_SPELL_ENTRY;
+ g_type_ensure (E_TYPE_DATE_EDIT);
+ g_type_ensure (E_TYPE_TIMEZONE_ENTRY);
+ g_type_ensure (E_TYPE_SOURCE_COMBO_BOX);
+ g_type_ensure (E_TYPE_SPELL_ENTRY);
priv->builder = gtk_builder_new ();
e_load_ui_builder_definition (priv->builder, "task-page.ui");
diff --git a/e-util/e-attachment-view.c b/e-util/e-attachment-view.c
index e468c14..b1abda1 100644
--- a/e-util/e-attachment-view.c
+++ b/e-util/e-attachment-view.c
@@ -868,8 +868,8 @@ e_attachment_view_default_init (EAttachmentViewInterface *interface)
G_TYPE_NONE, 0);
/* Register known handler types. */
- e_attachment_handler_image_get_type ();
- e_attachment_handler_sendto_get_type ();
+ g_type_ensure (E_TYPE_ATTACHMENT_HANDLER_IMAGE);
+ g_type_ensure (E_TYPE_ATTACHMENT_HANDLER_SENDTO);
}
void
diff --git a/e-util/e-send-options.c b/e-util/e-send-options.c
index bf50dbe..f586f36 100644
--- a/e-util/e-send-options.c
+++ b/e-util/e-send-options.c
@@ -665,7 +665,7 @@ e_send_options_dialog_run (ESendOptionsDialog *sod,
/* Make sure our custom widget classes are registered with
* GType before we load the GtkBuilder definition file. */
- E_TYPE_DATE_EDIT;
+ g_type_ensure (E_TYPE_DATE_EDIT);
priv->builder = gtk_builder_new ();
e_load_ui_builder_definition (priv->builder, "e-send-options.ui");
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 30683f4..4a50e7c 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -312,7 +312,6 @@ e_mail_migrate (EShellBackend *shell_backend,
gint micro,
GError **error)
{
- struct stat st;
const gchar *data_dir;
data_dir = e_shell_backend_get_data_dir (shell_backend);
diff --git a/modules/calendar/e-calendar-preferences.c b/modules/calendar/e-calendar-preferences.c
index 2902a50..93669b2 100644
--- a/modules/calendar/e-calendar-preferences.c
+++ b/modules/calendar/e-calendar-preferences.c
@@ -488,8 +488,8 @@ calendar_preferences_construct (ECalendarPreferences *prefs,
/* Make sure our custom widget classes are registered with
* GType before we load the GtkBuilder definition file. */
- E_TYPE_DATE_EDIT;
- E_TYPE_TIMEZONE_ENTRY;
+ g_type_ensure (E_TYPE_DATE_EDIT);
+ g_type_ensure (E_TYPE_TIMEZONE_ENTRY);
prefs->builder = gtk_builder_new ();
e_load_ui_builder_definition (prefs->builder, "e-calendar-preferences.ui");
diff --git a/shell/main.c b/shell/main.c
index d4e65b1..4540f51 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -506,6 +506,10 @@ main (gint argc,
/* The contact maps feature uses clutter-gtk. */
#ifdef WITH_CONTACT_MAPS
+ /* XXX This function is declared in gtk-clutter-util.h with an
+ * unnecessary G_GNUC_WARN_UNUSED_RESULT attribute. But we
+ * don't need the returned error code because we're checking
+ * the GError directly. Just ignore this warning. */
gtk_clutter_init_with_args (
&argc, &argv,
_("- The Evolution PIM and Email Client"),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]