use g_signal_handlers_disconnect_by_func instead of an old deprecated

http://bugzilla.gnome.org/show_bug.cgi?id=587991

(adapted from metacity commit a8f8970601,
original patch by Matt Kraai)
This commit is contained in:
Tomas Frydrych 2009-08-04 09:18:43 +01:00
parent 245908909b
commit e985bf0e7a

View File

@ -171,10 +171,8 @@ mouse_release (GtkWidget *invisible,
shutdown_grab (); shutdown_grab ();
gtk_signal_disconnect_by_func (GTK_OBJECT (invisible), g_signal_handlers_disconnect_by_func (invisible, mouse_motion, NULL);
GTK_SIGNAL_FUNC (mouse_motion), NULL); g_signal_handlers_disconnect_by_func (invisible, mouse_release, NULL);
gtk_signal_disconnect_by_func (GTK_OBJECT (invisible),
GTK_SIGNAL_FUNC (mouse_release), NULL);
return TRUE; return TRUE;
} }
@ -194,12 +192,8 @@ key_press (GtkWidget *invisible,
{ {
shutdown_grab (); shutdown_grab ();
gtk_signal_disconnect_by_func (GTK_OBJECT (invisible), g_signal_handlers_disconnect_by_func (invisible, mouse_press, NULL);
GTK_SIGNAL_FUNC (mouse_press), g_signal_handlers_disconnect_by_func (invisible, key_press, NULL);
NULL);
gtk_signal_disconnect_by_func (GTK_OBJECT (invisible),
GTK_SIGNAL_FUNC (key_press),
NULL);
return TRUE; return TRUE;
} }
@ -219,12 +213,8 @@ mouse_press (GtkWidget *invisible,
G_CALLBACK (mouse_motion), NULL); G_CALLBACK (mouse_motion), NULL);
g_signal_connect (invisible, "button_release_event", g_signal_connect (invisible, "button_release_event",
G_CALLBACK (mouse_release), NULL); G_CALLBACK (mouse_release), NULL);
gtk_signal_disconnect_by_func (GTK_OBJECT (invisible), g_signal_handlers_disconnect_by_func (invisible, mouse_press, NULL);
GTK_SIGNAL_FUNC (mouse_press), g_signal_handlers_disconnect_by_func (invisible, key_press, NULL);
NULL);
gtk_signal_disconnect_by_func (GTK_OBJECT (invisible),
GTK_SIGNAL_FUNC (key_press),
NULL);
return TRUE; return TRUE;
} }