Changeset 3014

Timestamp:

09/25/08 18:46:40

Author:

chipx86

Message:

Prevent a backwards-compatibility breakage introduced where the "reason" code was added to the "closed" signal. This meant that existing signal handlers that passed extra data would break. We now require that you call notify_notification_get_closed_reason() to get this data.

Files:

• trunk/libnotify/ChangeLog (modified) (1 diff)
• trunk/libnotify/libnotify/notification.c (modified) (7 diffs)
• trunk/libnotify/libnotify/notification.h (modified) (2 diffs)

trunk/libnotify/ChangeLog

@@ +1 @@
+Thu Sep 25 18:45:41 PDT 2008  Christian Hammond <chipx86@chipx86.com>
+
+    * libnotify/notification.c:
+    * libnotify/notification.h:
+      - Prevent a backwards-compatibility breakage introduced where the
+        "reason" code was added to the "closed" signal. This meant that
+        existing signal handlers that passed extra data would break. We now
+        require that you call notify_notification_get_closed_reason() to get
+        this data.
+
-Thu Sep 25 18:05:38 PDT 2008  Christian Hammond <chipx86@chipx86.com>
-

trunk/libnotify/libnotify/notification.c

@@ -91 +91 @@
-    gboolean updates_pending;
-    gboolean signals_registered;
+
+    gint closed_reason;
-};
-
@@ -107 +109 @@
-    PROP_ICON_NAME,
-    PROP_ATTACH_WIDGET,
-
+
+
-};
-
@@ -225 +228 @@
-                            G_PARAM_STATIC_BLURB));
-#endif /* HAVE_STATUS_ICON */
+
+    g_object_class_install_property(object_class, PROP_CLOSED_REASON,
+        g_param_spec_int("closed-reason", "Closed Reason",
+                         "The reason code for why the notification was closed",
+                         -1,
+                         G_MAXINT32,
+                         -1,
+                         G_PARAM_READABLE |
+                         G_PARAM_STATIC_NAME |
+                         G_PARAM_STATIC_NICK |
+                         G_PARAM_STATIC_BLURB));
-}
-
@@ -313 +327 @@
-#endif
-
+        case PROP_CLOSED_REASON:
+            g_value_set_int(value, priv->closed_reason);
+            break;
+
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@@ -340 +358 @@
-    obj->priv = g_new0(NotifyNotificationPrivate, 1);
-    obj->priv->timeout = NOTIFY_EXPIRES_DEFAULT;
+    obj->priv->closed_reason = -1;
-    obj->priv->hints = g_hash_table_new_full(g_str_hash, g_str_equal,
-                                             g_free,
@@ -718 +737 @@
-    {
-        g_object_ref(G_OBJECT(notification));
-
+
+
-        notification->priv->id = 0;
-        g_object_unref(G_OBJECT(notification));
@@ -1300 +1320 @@
-    return TRUE;
-}
+
+/**
+ * notify_notification_get_closed_reason:
+ * @notification: The notification.
+ *
+ * Returns the closed reason code for the notification. This is valid only
+ * after the "closed" signal is emitted.
+ *
+ * Returns: The closed reason code.
+ */
+gint
+notify_notification_get_closed_reason(const NotifyNotification *notification)
+{
+    g_return_val_if_fail(notification != NULL, -1);
+    g_return_val_if_fail(NOTIFY_IS_NOTIFICATION(notification), -1);
+
+    return notification->priv->closed_reason;
+}

trunk/libnotify/libnotify/notification.h

@@ -63 +63 @@
-
-    /* Signals */
-, gint reason
+
-};
-
@@ -156 +156 @@
-                                   GError **error);
-
+gint notify_notification_get_closed_reason(
+    const NotifyNotification *notification);
+
-G_END_DECLS
-