Do not #include <e-bonobo-widget.h>. (e_set_dialog_parent): Remove the
* 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:
@ -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
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user