diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2009-01-12 12:12:01 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-01-12 12:12:01 +0800 |
| commit | c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8 (patch) | |
| tree | 246bdb714e24e1b0c9a8ce4a3e45a46b230316de /addressbook/gui/component | |
| parent | f8b33bc4ebe9dd8043674141b5fe4660efaa99e8 (diff) | |
| download | gsoc2013-evolution-c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8.tar gsoc2013-evolution-c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8.tar.gz gsoc2013-evolution-c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8.tar.bz2 gsoc2013-evolution-c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8.tar.lz gsoc2013-evolution-c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8.tar.xz gsoc2013-evolution-c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8.tar.zst gsoc2013-evolution-c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8.zip | |
Merge revisions 36866:37046 from trunk.
svn path=/branches/kill-bonobo/; revision=37050
Diffstat (limited to 'addressbook/gui/component')
| -rw-r--r-- | addressbook/gui/component/Makefile.am | 1 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-component.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-config.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-view.c | 4 |
4 files changed, 4 insertions, 5 deletions
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index 53e0a2e804..c245592bea 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -18,6 +18,7 @@ INCLUDES = \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ -DPREFIX=\""$(prefix)"\" \ $(LDAP_CFLAGS) \ diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index a04bde676a..b79ff34cea 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -44,7 +44,7 @@ #include <string.h> #include <gtk/gtk.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gconf/gconf-client.h> #include <e-util/e-util.h> #include <libedataserver/e-url.h> diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index c1f3d76b75..7b94a8acea 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -627,7 +627,7 @@ eabc_general_offline(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, if (old) return old; else { - offline_setting = gtk_check_button_new_with_mnemonic (N_("Copy _book content locally for offline operation")); + offline_setting = gtk_check_button_new_with_mnemonic (_("Copy _book content locally for offline operation")); gtk_widget_show (offline_setting); gtk_container_add (GTK_CONTAINER (parent), offline_setting); g_signal_connect (offline_setting, "toggled", G_CALLBACK (offline_status_changed_cb), sdialog); diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index c3bb7c43d7..23872a3366 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -28,9 +28,7 @@ #include <string.h> #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libgnomeui/gnome-app.h> -#include <libgnomeui/gnome-href.h> -#include <libgnomeui/gnome-uidefs.h> +#include <gdk/gdkkeysyms.h> #include <bonobo/bonobo-generic-factory.h> #include <bonobo/bonobo-ui-util.h> #include <bonobo/bonobo-exception.h> |