diff options
Diffstat (limited to 'addressbook/gui')
14 files changed, 6 insertions, 37 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> diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c index be8c75e636..111dfe3bca 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-address.c +++ b/addressbook/gui/contact-editor/e-contact-editor-address.c @@ -26,7 +26,6 @@ #include <e-util/e-util-private.h> #include <glib/gi18n.h> -#include <libgnome/gnome-util.h> #include <misc/e-gui-utils.h> #include <string.h> #include <stdlib.h> diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index db7030e98b..3eeaa9d6ed 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c @@ -23,7 +23,6 @@ #include <config.h> #include "e-contact-editor-fullname.h" #include <e-util/e-util-private.h> -#include <libgnome/gnome-util.h> #include <glib/gi18n.h> static void e_contact_editor_fullname_init (EContactEditorFullname *card); diff --git a/addressbook/gui/contact-editor/e-contact-editor-im.c b/addressbook/gui/contact-editor/e-contact-editor-im.c index cc4fcc5d05..65a70f432b 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-im.c +++ b/addressbook/gui/contact-editor/e-contact-editor-im.c @@ -22,7 +22,6 @@ #include <config.h> #include "e-contact-editor-im.h" -#include <libgnome/gnome-util.h> #include <glib/gi18n.h> #include <string.h> #include <e-util/e-util-private.h> diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h index d4af1495c2..d216fe0435 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.h +++ b/addressbook/gui/contact-editor/e-contact-editor.h @@ -23,8 +23,6 @@ #ifndef __E_CONTACT_EDITOR_H__ #define __E_CONTACT_EDITOR_H__ -#include <libgnomeui/gnome-app.h> -#include <libgnomeui/gnome-app-helper.h> #include <glade/glade.h> #include "addressbook/gui/contact-editor/eab-editor.h" diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index 6de903d16f..d30559e34f 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -25,7 +25,6 @@ #include <string.h> #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libgnomeui/gnome-app.h> #include <libebook/e-book.h> #include <libebook/e-contact.h> #include <libedataserverui/e-source-combo-box.h> diff --git a/addressbook/gui/contact-editor/eab-editor.h b/addressbook/gui/contact-editor/eab-editor.h index cc95e003e1..4f108f509f 100644 --- a/addressbook/gui/contact-editor/eab-editor.h +++ b/addressbook/gui/contact-editor/eab-editor.h @@ -24,8 +24,6 @@ #ifndef __EAB_EDITOR_H__ #define __EAB_EDITOR_H__ -#include <libgnomeui/gnome-app.h> -#include <libgnomeui/gnome-app-helper.h> #include <glade/glade.h> #include <libebook/e-book.h> diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c index 61c6de7174..44703c9e57 100644 --- a/addressbook/gui/contact-editor/test-editor.c +++ b/addressbook/gui/contact-editor/test-editor.c @@ -92,26 +92,6 @@ editor_closed_cb (EContactEditor *ce, gpointer data) exit (0); } -#if 0 -static void about_callback( GtkWidget *widget, gpointer data ) -{ - - const gchar *authors[] = - { - "Christopher James Lahey <clahey@umich.edu>", - NULL - }; - - GtkWidget *about = - gnome_about_new ( _( "Contact Editor Test" ), VERSION, - _( "Copyright (C) 2000, Ximian, Inc." ), - authors, - _( "This should test the contact editor canvas item" ), - NULL); - gtk_widget_show (about); -} -#endif - int main( int argc, char *argv[] ) { char *cardstr; diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.h b/addressbook/gui/contact-list-editor/e-contact-list-editor.h index 2c420fcbd2..13b6864a9a 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.h @@ -23,8 +23,6 @@ #ifndef __E_CONTACT_LIST_EDITOR_H__ #define __E_CONTACT_LIST_EDITOR_H__ -#include <libgnomeui/gnome-app.h> -#include <libgnomeui/gnome-app-helper.h> #include <glade/glade.h> #include <libedataserverui/e-name-selector.h> diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c index 96fccd1b13..2a97169459 100644 --- a/addressbook/gui/merging/eab-contact-merging.c +++ b/addressbook/gui/merging/eab-contact-merging.c @@ -32,7 +32,7 @@ #include <string.h> #include "addressbook/gui/widgets/eab-contact-display.h" #include "e-util/e-util-private.h" -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> typedef struct dropdown_data dropdown_data; typedef enum { diff --git a/addressbook/gui/widgets/addresstypes.xml b/addressbook/gui/widgets/addresstypes.xml index c93f9cac19..cef8000cc4 100644 --- a/addressbook/gui/widgets/addresstypes.xml +++ b/addressbook/gui/widgets/addresstypes.xml @@ -79,7 +79,7 @@ </part> <part name="sexp"> <title>Expression</title> - <input type="code" name="code"/> + <input type="rawcode" name="rawcode"/> </part> </partset> |