From 675a9d147ab100372a7026688cbafc4665498c8b Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 5 Feb 2003 23:48:14 +0000 Subject: Remove cruft. (gladedir, etspecdir): Remove definitions. (glade_DATA): * gui/widgets/Makefile.am (INCLUDES): Remove cruft. (gladedir, etspecdir): Remove definitions. (glade_DATA): Empty, so remove it. * gui/widgets/e-addressbook-reflow-adapter.c: #include (addressbook_get_property): Remove unused variable * gui/widgets/e-addressbook-view.c: #include (get_selection_model): Add a g_return_val_if_reached. * gui/widgets/e-minicard.c: #include string.h, gtkmain.h, gnome-canvas-pixbuf.h (field_changed): s/gtk_object_unref/g_object_unref/ (get_left_width): Remove unused variable * gui/widgets/e-minicard-control.c: #include (pstream_load, pstream_save): Use g_ascii_strcasecmp * gui/widgets/e-minicard-view.c: #include * gui/widgets/e-minicard-view-widget.c (e_minicard_view_widget_new): s/gtk_type_new/g_object_new/ svn path=/trunk/; revision=19784 --- addressbook/gui/widgets/Makefile.am | 39 +++++++++------------- .../gui/widgets/e-addressbook-reflow-adapter.c | 2 +- addressbook/gui/widgets/e-addressbook-view.c | 2 ++ addressbook/gui/widgets/e-minicard-control.c | 9 ++--- addressbook/gui/widgets/e-minicard-view-widget.c | 2 +- addressbook/gui/widgets/e-minicard-view.c | 1 + addressbook/gui/widgets/e-minicard.c | 6 ++-- 7 files changed, 30 insertions(+), 31 deletions(-) (limited to 'addressbook') diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index aa3dbe464c..44938fb100 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -1,22 +1,20 @@ INCLUDES = \ - -DG_LOG_DOMAIN=\"e-minicard\" \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ - -DEVOLUTION_DATADIR=\""$(datadir)"\" \ - -DEVOLUTION_IMAGESDIR=\""$(datadir)"/evolution-$(BASE_VERSION)/images\" \ - -DEVOLUTION_GALVIEWSDIR=\""$(datadir)"/evolution-$(BASE_VERSION)/views\" \ - -I$(top_srcdir) \ - -I$(top_srcdir)/addressbook/backend \ - -I$(top_builddir)/addressbook/backend \ - -I$(top_srcdir)/addressbook/gui/contact-editor \ - -I$(top_srcdir)/addressbook/gui/merging \ - -I$(top_srcdir)/addressbook/gui/component \ - -I$(top_srcdir)/widgets/misc \ - -I$(top_builddir)/shell \ - -DG_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DLIBGNOME_DISABLE_DEPRECATED \ - -DLIBGNOMEUI_DISABLE_DEPRECATED \ + -DG_LOG_DOMAIN=\"e-minicard\" \ + -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ + -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ + -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ + -I$(top_srcdir) \ + -I$(top_srcdir)/addressbook/backend \ + -I$(top_builddir)/addressbook/backend \ + -I$(top_srcdir)/addressbook/gui/contact-editor \ + -I$(top_srcdir)/addressbook/gui/merging \ + -I$(top_srcdir)/addressbook/gui/component \ + -I$(top_srcdir)/widgets/misc \ + -I$(top_builddir)/shell \ + -DG_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED \ + -DLIBGNOME_DISABLE_DEPRECATED \ + -DLIBGNOMEUI_DISABLE_DEPRECATED \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) noinst_LIBRARIES = \ @@ -154,13 +152,8 @@ MARSHAL_GENERATED = e-addressbook-marshal.c e-addressbook-marshal.h # $(top_builddir)/addressbook/gui/merging/libecardmerging.a \ # $(EVOLUTION_ADDRESSBOOK_LIBS) -gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade -glade_DATA = - -etspecdir = $(datadir)/evolution-$(BASE_VERSION)/etspec etspec_DATA= e-addressbook-view.etspec EXTRA_DIST = \ - $(glade_DATA) \ $(etspec_DATA) \ e-addressbook-marshal.list diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 8b70de2734..0beb305384 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -2,6 +2,7 @@ #include +#include #include #include "e-addressbook-marshal.h" @@ -313,7 +314,6 @@ addressbook_get_property (GObject *object, guint prop_id, GValue *value, GParamS break; } case PROP_QUERY: { - char *query; g_object_get_property (G_OBJECT (priv->model), "query", value); break; diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index fd3576451e..c13baa4a95 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -67,6 +67,7 @@ #include "e-contact-editor.h" #include #include +#include #include #include @@ -556,6 +557,7 @@ get_selection_model (EAddressbookView *view) return e_treeview_get_selection_model (GTK_TREE_VIEW (view->object)); } #endif + g_return_val_if_reached (NULL); } /* Popup menu stuff */ diff --git a/addressbook/gui/widgets/e-minicard-control.c b/addressbook/gui/widgets/e-minicard-control.c index 6618ab5579..36f40d86d5 100644 --- a/addressbook/gui/widgets/e-minicard-control.c +++ b/addressbook/gui/widgets/e-minicard-control.c @@ -23,6 +23,7 @@ */ #include +#include #include #include @@ -175,8 +176,8 @@ pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream, char *vcard; EMinicardControl *minicard_control = data; - if (type && g_strcasecmp (type, "text/vCard") != 0 && - g_strcasecmp (type, "text/x-vCard") != 0) { + if (type && g_ascii_strcasecmp (type, "text/vCard") != 0 && + g_ascii_strcasecmp (type, "text/x-vCard") != 0) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_Bonobo_Persist_WrongDataType, NULL); return; @@ -224,8 +225,8 @@ pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream, char *vcard; int length; - if (type && g_strcasecmp (type, "text/vCard") != 0 && - g_strcasecmp (type, "text/x-vCard") != 0) { + if (type && g_ascii_strcasecmp (type, "text/vCard") != 0 && + g_ascii_strcasecmp (type, "text/x-vCard") != 0) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_Bonobo_Persist_WrongDataType, NULL); return; diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index 7a12860a3e..2ba6bc6852 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -178,7 +178,7 @@ e_minicard_view_widget_init (EMinicardViewWidget *view) GtkWidget * e_minicard_view_widget_new (EAddressbookReflowAdapter *adapter) { - EMinicardViewWidget *widget = E_MINICARD_VIEW_WIDGET (gtk_type_new (e_minicard_view_widget_get_type ())); + EMinicardViewWidget *widget = E_MINICARD_VIEW_WIDGET (g_object_new (e_minicard_view_widget_get_type (), NULL)); widget->adapter = adapter; g_object_ref (widget->adapter); diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 25d43fdd84..7f834317e2 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -30,6 +30,7 @@ #include #include #include +#include static void e_minicard_view_drag_data_get(GtkWidget *widget, GdkDragContext *context, diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index dc679aad55..9e02491d4b 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -20,11 +20,14 @@ */ #include +#include #include #include +#include #include #include #include +#include #include #include #include @@ -761,7 +764,7 @@ field_changed (EText *text, EMinicard *e_minicard) new_string = e_destination_export(dest); g_free(string); string=new_string; - gtk_object_unref (GTK_OBJECT (dest)); + g_object_unref (dest); } } } @@ -842,7 +845,6 @@ get_left_width(EMinicard *e_minicard) gchar *name; ECardSimpleField field; int width = -1; - GdkFont *font; PangoLayout *layout; layout = gtk_widget_create_pango_layout (GTK_WIDGET (GNOME_CANVAS_ITEM (e_minicard)->canvas), ""); -- cgit