gtk/gtkcombo.[ch] "activate" signal can be disabled now

Sat Mar 21 10:39:02 CET 1998 Paolo Molaro <lupus@debian.org>

	* gtk/gtkcombo.[ch] "activate" signal can be disabled now

ChangeLog

+Sat Mar 21 10:39:02 CET 1998 Paolo Molaro <lupus@debian.org>
+
+	* gtk/gtkcombo.[ch] "activate" signal can be disabled now
+
 Fri Mar 20 20:49:33 1998  Radek Doulik  <rodo@aquarius>
 
 	* gtk/gtktoolbar.c (gtk_toolbar_insert_element): changed packing

ChangeLog.pre-2-0

+Sat Mar 21 10:39:02 CET 1998 Paolo Molaro <lupus@debian.org>
+
+	* gtk/gtkcombo.[ch] "activate" signal can be disabled now
+
 Fri Mar 20 20:49:33 1998  Radek Doulik  <rodo@aquarius>
 
 	* gtk/gtktoolbar.c (gtk_toolbar_insert_element): changed packing

ChangeLog.pre-2-10

+Sat Mar 21 10:39:02 CET 1998 Paolo Molaro <lupus@debian.org>
+
+	* gtk/gtkcombo.[ch] "activate" signal can be disabled now
+
 Fri Mar 20 20:49:33 1998  Radek Doulik  <rodo@aquarius>
 
 	* gtk/gtktoolbar.c (gtk_toolbar_insert_element): changed packing

ChangeLog.pre-2-2

+Sat Mar 21 10:39:02 CET 1998 Paolo Molaro <lupus@debian.org>
+
+	* gtk/gtkcombo.[ch] "activate" signal can be disabled now
+
 Fri Mar 20 20:49:33 1998  Radek Doulik  <rodo@aquarius>
 
 	* gtk/gtktoolbar.c (gtk_toolbar_insert_element): changed packing

ChangeLog.pre-2-4

+Sat Mar 21 10:39:02 CET 1998 Paolo Molaro <lupus@debian.org>
+
+	* gtk/gtkcombo.[ch] "activate" signal can be disabled now
+
 Fri Mar 20 20:49:33 1998  Radek Doulik  <rodo@aquarius>
 
 	* gtk/gtktoolbar.c (gtk_toolbar_insert_element): changed packing

ChangeLog.pre-2-6

+Sat Mar 21 10:39:02 CET 1998 Paolo Molaro <lupus@debian.org>
+
+	* gtk/gtkcombo.[ch] "activate" signal can be disabled now
+
 Fri Mar 20 20:49:33 1998  Radek Doulik  <rodo@aquarius>
 
 	* gtk/gtktoolbar.c (gtk_toolbar_insert_element): changed packing

ChangeLog.pre-2-8

+Sat Mar 21 10:39:02 CET 1998 Paolo Molaro <lupus@debian.org>
+
+	* gtk/gtkcombo.[ch] "activate" signal can be disabled now
+
 Fri Mar 20 20:49:33 1998  Radek Doulik  <rodo@aquarius>
 
 	* gtk/gtktoolbar.c (gtk_toolbar_insert_element): changed packing

gtk/gtkcombo.c

@@ -463,7 +463,7 @@ gtk_combo_init (GtkCombo * combo)
 		      (GtkSignalFunc) gtk_combo_entry_key_press, combo);
   gtk_signal_connect_after (GTK_OBJECT (combo->entry), "focus_out_event",
 			    (GtkSignalFunc) gtk_combo_entry_focus_out, combo);
-  gtk_signal_connect (GTK_OBJECT (combo->entry), "activate",
+  combo->activate_id = gtk_signal_connect (GTK_OBJECT (combo->entry), "activate",
 		      (GtkSignalFunc) gtk_combo_popup_list, combo);
   gtk_signal_connect (GTK_OBJECT (combo->button), "clicked",
 		      (GtkSignalFunc) gtk_combo_popup_list, combo);
@@ -653,3 +653,15 @@ gtk_combo_size_allocate (GtkWidget     *widget,
       gtk_widget_size_allocate (combo->button, &button_allocation);
     }
 }
+
+void
+gtk_combo_disable_activate (GtkCombo* combo)
+{
+  g_return_if_fail (combo != NULL);
+  g_return_if_fail (GTK_IS_COMBO (combo));
+
+  if ( combo->activate_id ) {
+    gtk_signal_disconnect(GTK_OBJECT(combo), combo->activate_id);
+    combo->activate_id = 0;
+  }
+}

gtk/gtkcombo.h

@@ -51,6 +51,8 @@ struct _GtkCombo {
 	guint case_sensitive:1;
 	guint use_arrows:1;
 	guint use_arrows_always:1;
+
+	guint activate_id;
 };
 
 struct _GtkComboClass {
@@ -82,6 +84,8 @@ void       gtk_combo_set_item_string       (GtkCombo*    combo,
 void       gtk_combo_set_popdown_strings   (GtkCombo*    combo, 
                                             GList        *strings);
 
+void       gtk_combo_disable_activate      (GtkCombo*    combo);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */