aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-12-15 20:13:57 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-12-15 21:16:36 +0800
commit6fecc5899ecbfb700b2dd7fc866fa037c3fcfe04 (patch)
tree839a4d68cad08f6e00925b796037d8d091f2bf86
parent5e2efa2cd4ac7891fdf316dafd9ab249086e842a (diff)
downloadgsoc2013-evolution-6fecc5899ecbfb700b2dd7fc866fa037c3fcfe04.tar
gsoc2013-evolution-6fecc5899ecbfb700b2dd7fc866fa037c3fcfe04.tar.gz
gsoc2013-evolution-6fecc5899ecbfb700b2dd7fc866fa037c3fcfe04.tar.bz2
gsoc2013-evolution-6fecc5899ecbfb700b2dd7fc866fa037c3fcfe04.tar.lz
gsoc2013-evolution-6fecc5899ecbfb700b2dd7fc866fa037c3fcfe04.tar.xz
gsoc2013-evolution-6fecc5899ecbfb700b2dd7fc866fa037c3fcfe04.tar.zst
gsoc2013-evolution-6fecc5899ecbfb700b2dd7fc866fa037c3fcfe04.zip
Fix compiler warnings.
-rw-r--r--calendar/gui/dialogs/event-page.c6
-rw-r--r--calendar/gui/dialogs/memo-page.c4
-rw-r--r--calendar/gui/dialogs/task-page.c8
-rw-r--r--e-util/e-attachment-view.c4
-rw-r--r--e-util/e-send-options.c2
-rw-r--r--mail/e-mail-migrate.c1
-rw-r--r--modules/calendar/e-calendar-preferences.c4
-rw-r--r--shell/main.c4
8 files changed, 18 insertions, 15 deletions
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 793e98e49e..c12b7c7360 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 79b659a898..d6f9d93ffc 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 d8d64f32d6..b8324331c8 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 e468c14120..b1abda1e47 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 bf50dbefc0..f586f36f66 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 30683f4aeb..4a50e7c375 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 2902a50a58..93669b2aa7 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 d4e65b1a9c..4540f51984 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"),