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

(e_signal_connect_while_alive): New.

Browse Source 
(e_signal_connect_full_while_alive): Renamed from
e_gtk_signal_connect_full_while_alive().

svn path=/trunk/; revision=19171
This commit is contained in:
Ettore Perazzoli
2002-12-19 22:11:01 +00:00
parent 482cf3700a
commit 128eba1c6d
3 changed files with 55 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e-util/ChangeLog
View File

@ -1,3 +1,9 @@
2002-12-19 Ettore Perazzoli <ettore@ximian.com>
* e-gtk-utils.c (e_signal_connect_while_alive): New.
(e_signal_connect_full_while_alive): Renamed from
e_gtk_signal_connect_full_while_alive().
2002-12-16 Jeffrey Stedfast <fejj@ximian.com>
* e-html-utils.[c,h]: Removed. Back to the fiery depths of hell

50
e-util/e-gtk-utils.c
View File

@ -35,6 +35,24 @@
#include "e-gtk-utils.h"
void
e_signal_connect_while_alive (void *instance,
const char *name,
GCallback callback,
void *callback_data,
void *alive_instance)
{
GClosure *closure;
g_return_if_fail (GTK_IS_OBJECT (instance));
closure = g_cclosure_new (callback, callback_data, NULL);
g_object_watch_closure (alive_instance, closure);
g_signal_connect_closure_by_id (instance, g_signal_lookup (name, G_OBJECT_TYPE (object)), 0,
closure, FALSE);
}
/* (Cut and pasted from Gtk.) */
@ -79,36 +97,36 @@ alive_disconnecter (GtkObject *object,
* params like `gtk_signal_connect_full()'.
**/
void
e_gtk_signal_connect_full_while_alive (GtkObject *object,
const char *name,
GtkSignalFunc func,
GtkCallbackMarshal marshal,
void *data,
GtkDestroyNotify destroy_func,
gboolean object_signal,
gboolean after,
GtkObject *alive_object)
e_signal_connect_full_while_alive (void *instance,
const char *name,
GtkSignalFunc func,
GtkCallbackMarshal marshal,
void *data,
GtkDestroyNotify destroy_func,
gboolean object_signal,
gboolean after,
void *alive_instance)
{
DisconnectInfo *info;
g_return_if_fail (GTK_IS_OBJECT (object));
g_return_if_fail (GTK_IS_OBJECT (instance));
g_return_if_fail (name != NULL);
g_return_if_fail (func != NULL);
g_return_if_fail (GTK_IS_OBJECT (alive_object));
g_return_if_fail (GTK_IS_OBJECT (alive_instance));
info = g_new (DisconnectInfo, 1);
info->signal_handler = gtk_signal_connect_full (object, name,
info->signal_handler = gtk_signal_connect_full (instance, name,
func, marshal, data,
destroy_func,
object_signal, after);
instance_signal, after);
info->object1 = object;
info->disconnect_handler1 = gtk_signal_connect (object, "destroy",
info->object1 = instance;
info->disconnect_handler1 = gtk_signal_connect (instance, "destroy",
GTK_SIGNAL_FUNC (alive_disconnecter), info);
info->object2 = alive_object;
info->disconnect_handler2 = gtk_signal_connect (alive_object, "destroy",
info->disconnect_handler2 = gtk_signal_connect (alive_instance, "destroy",
GTK_SIGNAL_FUNC (alive_disconnecter), info);
}

24
e-util/e-gtk-utils.h
View File

@ -26,15 +26,21 @@
#include <gtk/gtkobject.h>
#include <gtk/gtkradiobutton.h>
void e_gtk_signal_connect_full_while_alive (GtkObject *object,
const char *name,
GtkSignalFunc func,
GtkCallbackMarshal marshal,
void *data,
GtkDestroyNotify destroy_func,
gboolean object_signal,
gboolean after,
GtkObject *alive_object);
void e_signal_connect_while_alive (void *object,
const char *name,
GCallback callback,
void *data,
void *alive_instance);
void e_signal_connect_full_while_alive (void *instance,
const char *name,
GtkSignalFunc func,
GtkCallbackMarshal marshal,
void *data,
GtkDestroyNotify destroy_func,
gboolean object_signal,
gboolean after,
void *alive_instance);
void e_make_widget_backing_stored (GtkWidget *widget);