aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-display.c
diff options
context:
space:
mode:
authorMiguel de Icaza <miguel@gnu.org>2000-04-06 14:46:20 +0800
committerMiguel de Icaza <miguel@src.gnome.org>2000-04-06 14:46:20 +0800
commitbbc6d63ef0aa4b2ae1244f1a7de63b0b86f3ce69 (patch)
tree10b8992cf86eb9aa0221266742d255dfaabcc08d /mail/mail-display.c
parent3d9889baee9c5c11cd960a43c0f51c449ce35b45 (diff)
downloadgsoc2013-evolution-bbc6d63ef0aa4b2ae1244f1a7de63b0b86f3ce69.tar
gsoc2013-evolution-bbc6d63ef0aa4b2ae1244f1a7de63b0b86f3ce69.tar.gz
gsoc2013-evolution-bbc6d63ef0aa4b2ae1244f1a7de63b0b86f3ce69.tar.bz2
gsoc2013-evolution-bbc6d63ef0aa4b2ae1244f1a7de63b0b86f3ce69.tar.lz
gsoc2013-evolution-bbc6d63ef0aa4b2ae1244f1a7de63b0b86f3ce69.tar.xz
gsoc2013-evolution-bbc6d63ef0aa4b2ae1244f1a7de63b0b86f3ce69.tar.zst
gsoc2013-evolution-bbc6d63ef0aa4b2ae1244f1a7de63b0b86f3ce69.zip
Load the icons from the installation path, not form the GNOME-libs
2000-04-06 Miguel de Icaza <miguel@gnu.org> * shell/e-shortcut.c (shell_icon_cb): Load the icons from the installation path, not form the GNOME-libs installation prefix. (shell_icon_cb): Memory leak fix. * shell/Makefile.am (imagesdir): Pass the EVOLUTION_IMAGES installation directory here. * art/Makefile.am (images_DATA): Renamed from pixmaps to images. 2000-04-06 Miguel de Icaza <miguel@gnu.org> * message-list.c: Stick pixmaps here. * mail-display.c (embeddable_destroy_cb): Replaced C++ comments with C comments. * message-list.c (load_internal_images): New function, loads images. (message_list_init_renderers): Load images, fix previous attempt at loading images. * Makefile.am (dist-hook): Added distribution of pixmaps. * pixmaps: New directory, used to hold the XPMs we ship with. * pixmaps/envelope-closed.xpm, pixmaps/envelope-open.xpm: Tigert's envelopes incorporated. 2000-04-06 Miguel de Icaza <miguel@gnu.org> * e-cell-text.c: Killed ARG_EDITABLE. (ect_event): Updated to new editable setup. (e_cell_text_new): Kill editable argument. * e-cell-toggle.c (etog_event): Handle editability here * e-cell-text.h: Removed editable bit field from here, it is now taken care at the e-cell level. * e-cell.c (e_cell_set_editable): New function. (e_cell_init): Set editable to TRUE by default. * test-check.c (check_test): update to new api * test-table.c (table_browser_test): ditto. (do_e_table_demo): ditto. * test-cols.c (multi_cols_test): ditto svn path=/trunk/; revision=2302
Diffstat (limited to 'mail/mail-display.c')
-rw-r--r--mail/mail-display.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 57da4b65f8..fa3d3588eb 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -141,7 +141,6 @@ embeddable_destroy_cb (GtkObject *obj, gpointer user_data)
{
BonoboWidget *be; /* bonobo embeddable */
BonoboViewFrame *vf; /* the embeddable view frame */
- GtkWidget *w; /* the viewframe widget */
BonoboObjectClient* server;
CORBA_Environment ev;
@@ -155,9 +154,9 @@ embeddable_destroy_cb (GtkObject *obj, gpointer user_data)
vf = bonobo_widget_get_view_frame (be);
bonobo_control_frame_control_deactivate (
BONOBO_CONTROL_FRAME (vf));
- //w = bonobo_control_frame_get_widget (BONOBO_CONTROL_FRAME (vf));
+ /* w = bonobo_control_frame_get_widget (BONOBO_CONTROL_FRAME (vf)); */
- //gtk_widget_destroy (w);
+ /* gtk_widget_destroy (w); */
CORBA_exception_init (&ev);
Bonobo_Unknown_unref (
@@ -167,7 +166,7 @@ embeddable_destroy_cb (GtkObject *obj, gpointer user_data)
CORBA_exception_free (&ev);
bonobo_object_destroy (BONOBO_OBJECT (vf));
- //gtk_object_unref (obj);
+ /* gtk_object_unref (obj); */
}