aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-10-02 04:24:49 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-10-02 04:24:49 +0800
commit656178049b4d1b73d4997aa983b778d4eb4054ae (patch)
treea5ad9c59d4fd231f6b6cb2e77eca139eaac8fe8d
parentf62728b55e201ea92e682e07b3253ce4fb42d5af (diff)
downloadgsoc2013-evolution-656178049b4d1b73d4997aa983b778d4eb4054ae.tar.gz
gsoc2013-evolution-656178049b4d1b73d4997aa983b778d4eb4054ae.tar.zst
gsoc2013-evolution-656178049b4d1b73d4997aa983b778d4eb4054ae.zip
Build with GTK_DISABLE_DEPRECATED and fix resulting breakage.
-rw-r--r--addressbook/conduit/address-conduit.c7
-rw-r--r--calendar/conduits/calendar/calendar-conduit.c7
-rw-r--r--calendar/conduits/memo/memo-conduit.c7
-rw-r--r--calendar/conduits/todo/todo-conduit.c7
-rw-r--r--configure.ac1
-rw-r--r--mail/e-mail-browser.c4
-rw-r--r--plugins/tnef-attachments/Makefile.am2
-rw-r--r--shell/e-shell-window-private.c4
-rw-r--r--widgets/misc/e-web-view.c4
9 files changed, 16 insertions, 27 deletions
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index b9a5731400..2b0317e70e 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -30,12 +30,7 @@
#define G_LOG_DOMAIN "eaddrconduit"
/* Work around deprecated API usage in GnomePilot. */
-#ifdef GTK_DISABLE_DEPRECATED
-#include <glib-object.h>
-#define GTK_CHECK_CAST G_TYPE_CHECK_INSTANCE_CAST
-typedef GType GtkType;
-#endif
-
+#undef GTK_DISABLE_DEPRECATED
#undef GTK_DISABLE_SINGLE_INCLUDES
#include <glib/gi18n.h>
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index b5897396ca..624615e49a 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -28,12 +28,7 @@
#define G_LOG_DOMAIN "ecalconduit"
/* Work around deprecated API usage in GnomePilot. */
-#ifdef GTK_DISABLE_DEPRECATED
-#include <glib-object.h>
-#define GTK_CHECK_CAST G_TYPE_CHECK_INSTANCE_CAST
-typedef GType GtkType;
-#endif
-
+#undef GTK_DISABLE_DEPRECATED
#undef GTK_DISABLE_SINGLE_INCLUDES
#include <glib/gi18n.h>
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
index af432f5809..2a1b190423 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -30,12 +30,7 @@
#define G_LOG_DOMAIN "ememoconduit"
/* Work around deprecated API usage in GnomePilot. */
-#ifdef GTK_DISABLE_DEPRECATED
-#include <glib-object.h>
-#define GTK_CHECK_CAST G_TYPE_CHECK_INSTANCE_CAST
-typedef GType GtkType;
-#endif
-
+#undef GTK_DISABLE_DEPRECATED
#undef GTK_DISABLE_SINGLE_INCLUDES
#include <glib/gi18n.h>
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index f4bc98ce5b..a625cc7c39 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -30,12 +30,7 @@
#define G_LOG_DOMAIN "etodoconduit"
/* Work around deprecated API usage in GnomePilot. */
-#ifdef GTK_DISABLE_DEPRECATED
-#include <glib-object.h>
-#define GTK_CHECK_CAST G_TYPE_CHECK_INSTANCE_CAST
-typedef GType GtkType;
-#endif
-
+#undef GTK_DISABLE_DEPRECATED
#undef GTK_DISABLE_SINGLE_INCLUDES
#include <glib/gi18n.h>
diff --git a/configure.ac b/configure.ac
index 600e7dd16e..c1c45a01aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,6 +71,7 @@ AS_COMPILER_FLAGS(WARNING_FLAGS,
-DPANGO_DISABLE_DEPRECATED
-DGDK_PIXBUF_DISABLE_DEPRECATED
-DGDK_DISABLE_DEPRECATED
+ -DGTK_DISABLE_DEPRECATED
-DG_DISABLE_SINGLE_INCLUDES
-DGTK_DISABLE_SINGLE_INCLUDES
-Wall -Wextra
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index 181daf8fa7..88e6202fda 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -126,12 +126,14 @@ mail_browser_menu_item_select_cb (EMailBrowser *browser,
GtkWidget *widget)
{
GtkAction *action;
+ GtkActivatable *activatable;
GtkStatusbar *statusbar;
const gchar *tooltip;
guint context_id;
gpointer data;
- action = gtk_widget_get_action (widget);
+ activatable = GTK_ACTIVATABLE (widget);
+ action = gtk_activatable_get_related_action (activatable);
tooltip = gtk_action_get_tooltip (action);
data = g_object_get_data (G_OBJECT (widget), "context-id");
diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am
index 26a679b58a..b503b9f0c0 100644
--- a/plugins/tnef-attachments/Makefile.am
+++ b/plugins/tnef-attachments/Makefile.am
@@ -18,6 +18,7 @@ liborg_gnome_tnef_attachments_la_CPPFLAGS = \
-I$(top_srcdir)/widgets \
-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
-DLOCALEDIR="\"$(localedir)\"" \
+ $(GNOME_PLATFORM_CFLAGS) \
$(EVOLUTION_MAIL_CFLAGS) \
$(TNEF_CFLAGS)
@@ -28,6 +29,7 @@ liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINE
liborg_gnome_tnef_attachments_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/em-format/libemformat.la \
+ $(GNOME_PLATFORM_LIBS) \
$(EVOLUTION_MAIL_LIBS) \
-lytnef
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c
index 2934a82730..1677d657ba 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -110,10 +110,12 @@ shell_window_menu_item_select_cb (EShellWindow *shell_window,
GtkWidget *widget)
{
GtkAction *action;
+ GtkActivatable *activatable;
GtkLabel *label;
const gchar *tooltip;
- action = gtk_widget_get_action (widget);
+ activatable = GTK_ACTIVATABLE (widget);
+ action = gtk_activatable_get_related_action (activatable);
tooltip = gtk_action_get_tooltip (action);
if (tooltip == NULL)
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index afbe2d9455..3a3e62b13b 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -365,9 +365,11 @@ web_view_menu_item_select_cb (EWebView *web_view,
GtkWidget *widget)
{
GtkAction *action;
+ GtkActivatable *activatable;
const gchar *tooltip;
- action = gtk_widget_get_action (widget);
+ activatable = GTK_ACTIVATABLE (widget);
+ action = gtk_activatable_get_related_action (activatable);
tooltip = gtk_action_get_tooltip (action);
if (tooltip == NULL)