close window when close button is clicked

diff --git a/src/glade/sensor-edit.glade b/src/glade/sensor-edit.glade
index 3430082..67fa6fe 100644 (file)
--- a/src/glade/sensor-edit.glade
+++ b/src/glade/sensor-edit.glade
@@ -49,6 +49,7 @@
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_stock">True</property>
+                <signal name="clicked" handler="ui_sensorpref_close_clicked_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>

diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index b6bcb1e..0b6d585 100644 (file)
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -368,11 +368,22 @@ static void select_sensor(struct psensor *s, struct psensor **sensors)
                }
 }
 
-static gboolean
-on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
+static void quit(void)
 {
        gtk_widget_destroy(GTK_WIDGET(w_dialog));
        w_dialog = NULL;
+}
+
+static gboolean
+on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
+{
+       quit();
+       return TRUE;
+}
+
+void ui_sensorpref_close_clicked_cb(GtkButton *btn, gpointer data)
+{
+       quit();
        return TRUE;
 }
 

diff --git a/src/ui_sensorpref.h b/src/ui_sensorpref.h
index 25ac0f2..bdd8950 100644 (file)
--- a/src/ui_sensorpref.h
+++ b/src/ui_sensorpref.h
@@ -33,5 +33,6 @@ void ui_sensorpref_color_set_cb(GtkColorButton *, gpointer);
 void ui_sensorpref_alarm_high_threshold_changed_cb(GtkSpinButton *, gpointer);
 void ui_sensorpref_alarm_low_threshold_changed_cb(GtkSpinButton *, gpointer);
 void ui_sensorpref_tree_selection_changed_cb(GtkTreeSelection *, gpointer);
+void ui_sensorpref_close_clicked_cb(GtkButton *, gpointer);
 
 #endif