diff options
| author | Owen Taylor <owt1@cornell.edu> | 1998-03-29 02:44:43 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-03-29 02:44:43 +0000 |
| commit | 93e1585614b72c684b4fa302f6ae2e6d5605e02e (patch) | |
| tree | f0040246098ac7e056fc75c824759d81027d9a37 /gtk/gtkcombo.c | |
| parent | 5b3cc69b4314a5206c0da6b16d34724ae0bba9ba (diff) | |
| download | gtk+-93e1585614b72c684b4fa302f6ae2e6d5605e02e.tar.gz | |
Disconnect from combo->entry, not combo. (From: Daniel Skarda
Sat Mar 28 21:18:42 1998 Owen Taylor <owt1@cornell.edu>
* 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
Diffstat (limited to 'gtk/gtkcombo.c')
| -rw-r--r-- | gtk/gtkcombo.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } } |