aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--e-util/ChangeLog6
-rw-r--r--e-util/e-dialog-utils.c13
-rw-r--r--shell/ChangeLog4
-rw-r--r--shell/e-shell-view.c1
-rw-r--r--widgets/misc/ChangeLog6
-rw-r--r--widgets/misc/Makefile.am2
6 files changed, 23 insertions, 9 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 11175f8e88..58dcd79912 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,5 +1,11 @@
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.
2003-01-09 Chris Toshok <toshok@ximian.com>
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index c4b36dc17a..2a4a3bb07d 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -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
}
/**
diff --git a/shell/ChangeLog b/shell/ChangeLog
index f855b3f658..fd490490f5 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,9 @@
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.
2003-01-14 Rodney Dawes <dobey@ximian.com>
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 6252f6d40c..426ceb0750 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -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>
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 8cb06a2441..a2eec4d1b6 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,5 +1,11 @@
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
e-book-marshal.list.
(widgetsinclude_HEADERS): Add e-bonobo-widget.h.
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index f2d54c8f46..aa56b42c95 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -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 \