aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/conduit/Makefile.am13
-rw-r--r--addressbook/conduit/address-conduit-config.h1
-rw-r--r--addressbook/gui/widgets/e-minicard-label.c2
-rw-r--r--addressbook/gui/widgets/e-minicard.c1
5 files changed, 14 insertions, 11 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 74c74858bb..713e42c213 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2000-12-25 Miguel de Icaza <miguel@helixcode.com>
+
+ * gui/widgets/e-minicard.c (e_minicard_realize): Set draw
+ background to FALSE.
+
+ * gui/widgets/e-minicard-label.c (e_minicard_label_construct): ditto.
+ (e_minicard_label_construct): ditto
+
2000-12-23 Christopher James Lahey <clahey@helixcode.com>
* contact-editor/fullname-strings.h,
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
index f17f060aef..ab8a972b5b 100644
--- a/addressbook/conduit/Makefile.am
+++ b/addressbook/conduit/Makefile.am
@@ -12,17 +12,8 @@ bin_PROGRAMS = e-address-conduit-control-applet
e_address_conduit_control_applet_SOURCES = address-conduit-control-applet.c
-e_address_conduit_control_applet_LDADD = \
- $(CAPPLET_LIBS) \
- $(GNOME_LIBDIR) \
- $(GNOME_PILOT_LIBS) \
- $(PISOCK_LIBDIR) $(PISOCK_LIBS) \
- $(GNOME_CAPPLET_LIBS) \
- $(BONOBO_VFS_GNOME_LIBS) \
- $(GNOME_XML_LIB) \
- $(GNOMEUI_LIBS) \
- $(INTLLIBS)
-
+e_address_conduit_control_applet_LDFLAGS = \
+ -rdynamic -L/usr/lib -L/usr/X11R6/lib -lcapplet -lgnorba -lgpilotd -lgpilotdcm -lgpilotdconduit -lgnomevfs -lgthread -lpthread -lbonobo -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -ldb1 -lgdk_pixbuf -ltiff -ljpeg -lpng -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lnsl -lm -lxml -lz -lpisock
# Address Conduit
e_address_conduitsdir=$(libdir)/gnome-pilot/conduits
diff --git a/addressbook/conduit/address-conduit-config.h b/addressbook/conduit/address-conduit-config.h
index 1afa8cef4b..d0981af6bf 100644
--- a/addressbook/conduit/address-conduit-config.h
+++ b/addressbook/conduit/address-conduit-config.h
@@ -27,6 +27,7 @@
#include <gnome.h>
#include <libgpilotdCM/gnome-pilot-conduit-management.h>
+#include <gpilotd/gnome-pilot-conduit.h>
#include <libgpilotdCM/gnome-pilot-conduit-config.h>
/* Configuration info */
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 3bdf1f2c47..6795702454 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -245,6 +245,7 @@ e_minicard_label_construct (GnomeCanvasItem *item)
"use_ellipsis", TRUE,
"font_gdk", font,
"fill_color", "black",
+ "draw_background", FALSE,
NULL );
e_canvas_item_move_absolute(e_minicard_label->fieldname, 2, 1);
@@ -258,6 +259,7 @@ e_minicard_label_construct (GnomeCanvasItem *item)
"font_gdk", font,
"fill_color", "black",
"editable", TRUE,
+ "draw_background", FALSE,
NULL );
e_canvas_item_move_absolute(e_minicard_label->field, ( e_minicard_label->width / 2 + 2), 1);
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 6bf1d57c9a..e313842193 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -294,6 +294,7 @@ e_minicard_realize (GnomeCanvasItem *item)
#endif
"fill_color_gdk", &canvas->style->fg[GTK_STATE_NORMAL],
"text", "",
+ "draw_background", FALSE,
NULL );
e_canvas_item_move_absolute(e_minicard->header_text, 6, 6);