[114686] users/devans/GNOME-3/stable/dports/gnome/seahorse/files

[devans at macports.org]

Revision: 114686
          https://trac.macports.org/changeset/114686
Author:   devans at macports.org
Date:     2013-12-13 14:30:27 -0800 (Fri, 13 Dec 2013)
Log Message:
-----------
GNOME-3/stable/dports: seahorse 3.10.1, update patch files, builds but segfaults in vala code on startup.

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-gkr-gkr-backend.vala.diff
    users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-ssh-seahorse-ssh-key-properties.c.diff

Removed Paths:
-------------
    users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-gkr-seahorse-gkr-actions.c.diff
    users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-gkr-seahorse-gkr-backend.c.diff

Added: users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-gkr-gkr-backend.vala.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-gkr-gkr-backend.vala.diff	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-gkr-gkr-backend.vala.diff	2013-12-13 22:30:27 UTC (rev 114686)
@@ -0,0 +1,20 @@
+--- gkr/gkr-backend.vala.orig	2013-11-25 15:34:04.000000000 -0800
++++ gkr/gkr-backend.vala	2013-11-25 15:38:44.000000000 -0800
+@@ -64,7 +64,7 @@
+ 	private Gtk.ActionGroup _actions;
+ 
+ 	construct {
+-		return_if_fail(_instance == null);
++		return_val_if_fail(_instance == null, null);
+ 		Backend._instance = this;
+ 
+ 		this._actions = BackendActions.instance(this);
+@@ -154,7 +154,7 @@
+ 	}
+ 
+ 	public static Backend instance() {
+-		return_if_fail(Backend._instance != null);
++		return_val_if_fail(Backend._instance != null, null);
+ 		return Backend._instance;
+ 	}
+ 

Deleted: users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-gkr-seahorse-gkr-actions.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-gkr-seahorse-gkr-actions.c.diff	2013-12-13 22:16:54 UTC (rev 114685)
+++ users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-gkr-seahorse-gkr-actions.c.diff	2013-12-13 22:30:27 UTC (rev 114686)
@@ -1,20 +0,0 @@
---- gkr/seahorse-gkr-actions.c.orig	2013-09-18 09:57:11.000000000 -0700
-+++ gkr/seahorse-gkr-actions.c	2013-09-18 10:00:05.000000000 -0700
-@@ -217,7 +217,7 @@
- 	GError *error = NULL;
- 	GVariant *retval;
- 
--	retval = secret_service_prompt_at_dbus_path_finish (SECRET_SERVICE (source), result, NULL, &error);
-+	retval = secret_service_prompt_at_dbus_path_finish (SECRET_SERVICE (source), result, &error);
- 	if (retval != NULL)
- 		g_variant_unref (retval);
- 	if (error != NULL)
-@@ -241,7 +241,7 @@
- 	retval = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error);
- 	if (error == NULL) {
- 		g_variant_get (retval, "(&o)", &prompt_path);
--		secret_service_prompt_at_dbus_path (change->service, prompt_path, NULL,
-+		secret_service_prompt_at_dbus_path (change->service, prompt_path, NULL, NULL,
- 		                                    on_change_password_done, change);
- 		g_variant_unref (retval);
- 	} else {

Deleted: users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-gkr-seahorse-gkr-backend.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-gkr-seahorse-gkr-backend.c.diff	2013-12-13 22:16:54 UTC (rev 114685)
+++ users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-gkr-seahorse-gkr-backend.c.diff	2013-12-13 22:30:27 UTC (rev 114686)
@@ -1,20 +0,0 @@
---- gkr/seahorse-gkr-backend.c.orig	2013-09-18 10:09:34.000000000 -0700
-+++ gkr/seahorse-gkr-backend.c	2013-09-18 10:11:32.000000000 -0700
-@@ -162,7 +162,7 @@
- 	SeahorseGkrBackend *self = SEAHORSE_GKR_BACKEND (user_data);
- 	GError *error = NULL;
- 
--	self->service = secret_service_new_finish (result, &error);
-+	self->service = secret_service_open_finish (result, &error);
- 	if (error == NULL) {
- 		g_signal_connect (self->service, "notify::collections", G_CALLBACK (on_notify_collections), self);
- 		refresh_collection (self);
-@@ -185,7 +185,7 @@
- 
- 	G_OBJECT_CLASS (seahorse_gkr_backend_parent_class)->constructed (obj);
- 
--	secret_service_new (my_secret_service_get_type (), NULL, SECRET_SERVICE_OPEN_SESSION,
-+	secret_service_open (my_secret_service_get_type (), NULL, SECRET_SERVICE_OPEN_SESSION,
- 	                    NULL, on_service_new, g_object_ref (self));
- }
- 

Added: users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-ssh-seahorse-ssh-key-properties.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-ssh-seahorse-ssh-key-properties.c.diff	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-ssh-seahorse-ssh-key-properties.c.diff	2013-12-13 22:30:27 UTC (rev 114686)
@@ -0,0 +1,11 @@
+--- ssh/seahorse-ssh-key-properties.c.orig	2013-11-25 15:42:57.000000000 -0800
++++ ssh/seahorse-ssh-key-properties.c	2013-11-25 15:43:42.000000000 -0800
+@@ -364,7 +364,7 @@
+     do_details (swidget);
+     
+     widget = seahorse_widget_get_widget (swidget, "comment-entry");
+-    g_return_if_fail (widget != NULL);
++    g_return_val_if_fail (widget != NULL, NULL);
+ 
+     /* A public key only */
+     if (seahorse_object_get_usage (SEAHORSE_OBJECT (skey)) != SEAHORSE_USAGE_PRIVATE_KEY) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131213/af92bfa6/attachment-0001.html>