X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-button-editable.c;h=530a9a4c4ed64de31d45a10b5c2dace06d33ba0d;hb=refs%2Fbuilds%2F20121208032040%2Fpspp;hp=f7028f5f5b5659de58d876c9bdcb95d13927e960;hpb=8f843c3a5e905c7f233d436b684a7d8fd958bd6c;p=pspp

diff --git a/src/ui/gui/psppire-button-editable.c b/src/ui/gui/psppire-button-editable.c
index f7028f5f5b..530a9a4c4e 100644
--- a/src/ui/gui/psppire-button-editable.c
+++ b/src/ui/gui/psppire-button-editable.c
@@ -41,7 +41,8 @@ enum
   {
     PROP_0,
     PROP_PATH,
-    PROP_SLASH
+    PROP_SLASH,
+    PROP_EDITING_CANCELED
   };
 
 static void
@@ -63,6 +64,9 @@ psppire_button_editable_set_property (GObject      *object,
       psppire_button_editable_set_slash (obj, g_value_get_boolean (value));
       break;
 
+    case PROP_EDITING_CANCELED:
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -87,6 +91,10 @@ psppire_button_editable_get_property (GObject      *object,
       g_value_set_boolean (value, psppire_button_editable_get_slash (obj));
       break;
 
+    case PROP_EDITING_CANCELED:
+      g_value_set_boolean (value, FALSE);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -94,14 +102,13 @@ psppire_button_editable_get_property (GObject      *object,
 }
 
 static void
-psppire_button_editable_dispose (GObject *gobject)
+psppire_button_editable_finalize (GObject *gobject)
 {
   PsppireButtonEditable *obj = PSPPIRE_BUTTON_EDITABLE (gobject);
 
   g_free (obj->path);
-  obj->path = NULL;
 
-  G_OBJECT_CLASS (psppire_button_editable_parent_class)->dispose (gobject);
+  G_OBJECT_CLASS (psppire_button_editable_parent_class)->finalize (gobject);
 }
 
 static gboolean
@@ -110,7 +117,7 @@ psppire_button_editable_button_release (GtkWidget      *widget,
 {
   if (event->button == 1)
     {
-      g_signal_emit_by_name (widget, "button-release-event", event, NULL);
+      g_signal_emit_by_name (widget, "released", event, NULL);
     }
 
   return TRUE;
@@ -149,7 +156,7 @@ psppire_button_editable_class_init (PsppireButtonEditableClass *class)
 
   gobject_class->set_property = psppire_button_editable_set_property;
   gobject_class->get_property = psppire_button_editable_get_property;
-  gobject_class->dispose = psppire_button_editable_dispose;
+  gobject_class->finalize = psppire_button_editable_finalize;
 
   widget_class->button_release_event = psppire_button_editable_button_release;
   widget_class->expose_event = psppire_button_editable_expose_event;
@@ -170,6 +177,9 @@ psppire_button_editable_class_init (PsppireButtonEditableClass *class)
                                                          FALSE,
                                                          G_PARAM_READWRITE));
 
+  g_object_class_override_property (gobject_class,
+                                   PROP_EDITING_CANCELED,
+                                    "editing-canceled");
 }
 
 static void