From 93e1585614b72c684b4fa302f6ae2e6d5605e02e Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 29 Mar 1998 02:44:43 +0000 Subject: Disconnect from combo->entry, not combo. (From: Daniel Skarda Sat Mar 28 21:18:42 1998 Owen Taylor * gtk/gtkcombo.c (gtk_combo_disable_activate): Disconnect from combo->entry, not combo. (From: Daniel Skarda <0rfelyus@atrey.karlin.mff.cuni.cz>) * gdk/gdkpixmap.c (gdk_pixmap_colormap_create_from_xpm): Deal better with xpm's with bad colors in them. Plus, 3rd attempt to commit gtklabel changes --- gtk/gtkcombo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gtk/gtkcombo.c') diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c index 05e510293d..be34621167 100644 --- a/gtk/gtkcombo.c +++ b/gtk/gtkcombo.c @@ -679,7 +679,7 @@ gtk_combo_disable_activate (GtkCombo* combo) g_return_if_fail (GTK_IS_COMBO (combo)); if ( combo->activate_id ) { - gtk_signal_disconnect(GTK_OBJECT(combo), combo->activate_id); + gtk_signal_disconnect(GTK_OBJECT(combo->entry), combo->activate_id); combo->activate_id = 0; } } -- cgit v1.2.1