From: Evan Nemerson <evan@coeus-group.com>
Date: Mon, 8 Nov 2010 10:43:46 +0000 (-0800)
Subject: libnotify: Update to 0.7.0
X-Git-Tag: 0.11.2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d35d0d5253f482ea845508e6cfb262596a7305e;p=thirdparty%2Fvala.git

libnotify: Update to 0.7.0

Fixes bug 633819.
---

diff --git a/vapi/libnotify.vapi b/vapi/libnotify.vapi
index f9019779f..d919e360f 100644
--- a/vapi/libnotify.vapi
+++ b/vapi/libnotify.vapi
@@ -5,16 +5,14 @@ namespace Notify {
 	[CCode (cheader_filename = "libnotify/notify.h")]
 	public class Notification : GLib.Object {
 		[CCode (has_construct_function = false)]
-		public Notification (string summary, string? body, string? icon, Gtk.Widget? attach);
+		public Notification (string summary, string? body, string? icon);
 		public void add_action (string action, string label, owned Notify.ActionCallback callback);
-		public void attach_to_status_icon (Gtk.StatusIcon status_icon);
-		public void attach_to_widget (Gtk.Widget attach);
 		public void clear_actions ();
 		public void clear_hints ();
 		public bool close () throws GLib.Error;
 		public int get_closed_reason ();
 		public void set_category (string category);
-		public void set_geometry_hints (Gdk.Screen screen, int x, int y);
+		public void set_hint (string key, GLib.Variant value);
 		public void set_hint_byte (string key, uchar value);
 		public void set_hint_byte_array (string key, uchar[] value, size_t len);
 		public void set_hint_double (string key, double value);
@@ -27,10 +25,6 @@ namespace Notify {
 		public void set_urgency (Notify.Urgency urgency);
 		public bool show () throws GLib.Error;
 		public bool update (string summary, string body, string icon);
-		[CCode (has_construct_function = false)]
-		public Notification.with_status_icon (string summary, string body, string icon, Gtk.StatusIcon status_icon);
-		[NoAccessorMethod]
-		public Gtk.Widget attach_widget { owned get; set construct; }
 		[NoAccessorMethod]
 		public string body { owned get; set construct; }
 		public int closed_reason { get; }
@@ -39,8 +33,6 @@ namespace Notify {
 		[NoAccessorMethod]
 		public int id { get; set construct; }
 		[NoAccessorMethod]
-		public Gtk.StatusIcon status_icon { owned get; set construct; }
-		[NoAccessorMethod]
 		public string summary { owned get; set construct; }
 		public virtual signal void closed ();
 	}
@@ -57,6 +49,12 @@ namespace Notify {
 	[CCode (cheader_filename = "libnotify/notify.h")]
 	public const int EXPIRES_NEVER;
 	[CCode (cheader_filename = "libnotify/notify.h")]
+	public const int VERSION_MAJOR;
+	[CCode (cheader_filename = "libnotify/notify.h")]
+	public const int VERSION_MICRO;
+	[CCode (cheader_filename = "libnotify/notify.h")]
+	public const int VERSION_MINOR;
+	[CCode (cheader_filename = "libnotify/notify.h")]
 	public static unowned string get_app_name ();
 	[CCode (cheader_filename = "libnotify/notify.h")]
 	public static unowned GLib.List get_server_caps ();
diff --git a/vapi/packages/libnotify/libnotify.gi b/vapi/packages/libnotify/libnotify.gi
index 81cdc2c03..e1c1bea95 100644
--- a/vapi/packages/libnotify/libnotify.gi
+++ b/vapi/packages/libnotify/libnotify.gi
@@ -2,7 +2,7 @@
 <api version="1.0">
 	<namespace name="Notify">
 		<function name="get_app_name" symbol="notify_get_app_name">
-			<return-type type="gchar*"/>
+			<return-type type="char*"/>
 		</function>
 		<function name="get_server_caps" symbol="notify_get_server_caps">
 			<return-type type="GList*"/>
@@ -53,20 +53,6 @@
 					<parameter name="free_func" type="GFreeFunc"/>
 				</parameters>
 			</method>
-			<method name="attach_to_status_icon" symbol="notify_notification_attach_to_status_icon">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="notification" type="NotifyNotification*"/>
-					<parameter name="status_icon" type="GtkStatusIcon*"/>
-				</parameters>
-			</method>
-			<method name="attach_to_widget" symbol="notify_notification_attach_to_widget">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="notification" type="NotifyNotification*"/>
-					<parameter name="attach" type="GtkWidget*"/>
-				</parameters>
-			</method>
 			<method name="clear_actions" symbol="notify_notification_clear_actions">
 				<return-type type="void"/>
 				<parameters>
@@ -98,16 +84,6 @@
 					<parameter name="summary" type="char*"/>
 					<parameter name="body" type="char*"/>
 					<parameter name="icon" type="char*"/>
-					<parameter name="attach" type="GtkWidget*"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_with_status_icon" symbol="notify_notification_new_with_status_icon">
-				<return-type type="NotifyNotification*"/>
-				<parameters>
-					<parameter name="summary" type="char*"/>
-					<parameter name="body" type="char*"/>
-					<parameter name="icon" type="char*"/>
-					<parameter name="status_icon" type="GtkStatusIcon*"/>
 				</parameters>
 			</constructor>
 			<method name="set_category" symbol="notify_notification_set_category">
@@ -117,13 +93,12 @@
 					<parameter name="category" type="char*"/>
 				</parameters>
 			</method>
-			<method name="set_geometry_hints" symbol="notify_notification_set_geometry_hints">
+			<method name="set_hint" symbol="notify_notification_set_hint">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="notification" type="NotifyNotification*"/>
-					<parameter name="screen" type="GdkScreen*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
+					<parameter name="key" type="char*"/>
+					<parameter name="value" type="GVariant*"/>
 				</parameters>
 			</method>
 			<method name="set_hint_byte" symbol="notify_notification_set_hint_byte">
@@ -219,12 +194,10 @@
 					<parameter name="icon" type="char*"/>
 				</parameters>
 			</method>
-			<property name="attach-widget" type="GtkWidget*" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="body" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="closed-reason" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="icon-name" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="id" type="gint" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="status-icon" type="GtkStatusIcon*" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="summary" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
 			<signal name="closed" when="FIRST">
 				<return-type type="void"/>
@@ -235,5 +208,8 @@
 		</object>
 		<constant name="NOTIFY_EXPIRES_DEFAULT" type="int" value="-1"/>
 		<constant name="NOTIFY_EXPIRES_NEVER" type="int" value="0"/>
+		<constant name="NOTIFY_VERSION_MAJOR" type="int" value="0"/>
+		<constant name="NOTIFY_VERSION_MICRO" type="int" value="0"/>
+		<constant name="NOTIFY_VERSION_MINOR" type="int" value="7"/>
 	</namespace>
 </api>