callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not #include <e-bonobo-widget.h>. (e_set_dialog_parent): Remove the

Browse Source 
* e-dialog-utils.c: Do not #include <e-bonobo-widget.h>.
(e_set_dialog_parent): Remove the BonoboWidget handling stuff (it
doesn't really work anyways).

* e-shell-view.c: Do not #include "e-bonobo-widget.h".

* Makefile.am (widgetsinclude_HEADERS): Ooops, remove
e-bonobo-widget.h.
(libemiscwidgets_a_SOURCES): Likewise, remove e-bonobo-widget.c.

svn path=/trunk/; revision=19460
This commit is contained in:
Ettore Perazzoli
2003-01-14 20:19:26 +00:00
parent fcdb82a93a
commit 3be3c9494b
6 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e-util/ChangeLog
View File

@ -1,3 +1,9 @@
2003-01-14 Ettore Perazzoli <ettore@ximian.com>
* e-dialog-utils.c: Do not #include <e-bonobo-widget.h>.
(e_set_dialog_parent): Remove the BonoboWidget handling stuff (it
doesn't really work anyways).
2003-01-14 Ettore Perazzoli <ettore@ximian.com>
* Makefile.am (eutilinclude_HEADERS): Add e-dialog-utils.h.

13
e-util/e-dialog-utils.c
View File

@ -24,8 +24,6 @@
#include "e-dialog-utils.h"
#include "widgets/misc/e-bonobo-widget.h"
#include <glib.h>
#include <gdk/gdkx.h>
#include <gdk/gdkprivate.h>
@ -123,11 +121,7 @@ void
e_set_dialog_parent (GtkWindow *dialog,
GtkWidget *parent_widget)
{
Bonobo_PropertyBag property_bag;
GtkWidget *toplevel;
GdkWindow *gdk_window;
CORBA_char *id;
guint32 xid;
g_return_if_fail (dialog != NULL);
g_return_if_fail (GTK_IS_WINDOW (dialog));
@ -144,6 +138,12 @@ e_set_dialog_parent (GtkWindow *dialog,
return;
}
#if 0
Bonobo_PropertyBag property_bag;
GdkWindow *gdk_window;
CORBA_char *id;
guint32 xid;
property_bag = bonobo_control_get_ambient_properties (BONOBO_CONTROL (toplevel), NULL);
if (property_bag == CORBA_OBJECT_NIL)
return;
@ -156,6 +156,7 @@ e_set_dialog_parent (GtkWindow *dialog,
gdk_window = gdk_window_foreign_new (xid);
set_transient_for_gdk (dialog, gdk_window);
#endif
}
/**

4
shell/ChangeLog
View File

@ -1,3 +1,7 @@
2003-01-14 Ettore Perazzoli <ettore@ximian.com>
* e-shell-view.c: Do not #include "e-bonobo-widget.h".
2003-01-14 Ettore Perazzoli <ettore@ximian.com>
* Makefile.am (EXTRA_DIST): Add $(schema_DATA) here.

1
shell/e-shell-view.c
View File

@ -48,7 +48,6 @@
#include "e-util/e-gtk-utils.h"
#include "widgets/misc/e-clipped-label.h"
#include "widgets/misc/e-bonobo-widget.h"
#include <gtk/gtkwidget.h>

6
widgets/misc/ChangeLog
View File

@ -1,3 +1,9 @@
2003-01-14 Ettore Perazzoli <ettore@ximian.com>
* Makefile.am (widgetsinclude_HEADERS): Ooops, remove
e-bonobo-widget.h.
(libemiscwidgets_a_SOURCES): Likewise, remove e-bonobo-widget.c.
2003-01-14 Ettore Perazzoli <ettore@ximian.com>
* Makefile.am (EXTRA_DIST): e-util-marshal.list, not

2
widgets/misc/Makefile.am
View File

@ -15,7 +15,6 @@ privlib_LIBRARIES = \
widgetsincludedir = $(includedir)/evolution/widgets
widgetsinclude_HEADERS = \
e-bonobo-widget.h \
e-calendar.h \
e-calendar-item.h \
e-cell-date-edit.h \
@ -35,7 +34,6 @@ widgetsinclude_HEADERS = \
libemiscwidgets_a_SOURCES = \
$(widgetsinclude_HEADERS) \
e-bonobo-widget.c \
e-calendar.c \
e-calendar-item.c \
e-cell-date-edit.c \