<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[114686] users/devans/GNOME-3/stable/dports/gnome/seahorse/files</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/114686">114686</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2013-12-13 14:30:27 -0800 (Fri, 13 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable/dports: seahorse 3.10.1, update patch files, builds but segfaults in vala code on startup.</pre>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomeseahorsefilespatchgkrgkrbackendvaladiff">users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-gkr-gkr-backend.vala.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeseahorsefilespatchsshseahorsesshkeypropertiescdiff">users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-ssh-seahorse-ssh-key-properties.c.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomeseahorsefilespatchgkrseahorsegkractionscdiff">users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-gkr-seahorse-gkr-actions.c.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeseahorsefilespatchgkrseahorsegkrbackendcdiff">users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-gkr-seahorse-gkr-backend.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsgnomeseahorsefilespatchgkrgkrbackendvaladiff"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-gkr-gkr-backend.vala.diff (0 => 114686)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+--- 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;
+ }
+
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeseahorsefilespatchgkrseahorsegkractionscdiff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-gkr-seahorse-gkr-actions.c.diff (114685 => 114686)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,20 +0,0 @@
</span><del>---- 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 {
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeseahorsefilespatchgkrseahorsegkrbackendcdiff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-gkr-seahorse-gkr-backend.c.diff (114685 => 114686)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,20 +0,0 @@
</span><del>---- 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));
- }
-
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeseahorsefilespatchsshseahorsesshkeypropertiescdiff"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/stable/dports/gnome/seahorse/files/patch-ssh-seahorse-ssh-key-properties.c.diff (0 => 114686)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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) {
</ins></span></pre>
</div>
</div>
</body>
</html>