seahorse r2427 - in trunk: . src
- From: sadam svn gnome org
- To: svn-commits-list gnome org
- Subject: seahorse r2427 - in trunk: . src
- Date: Mon, 1 Sep 2008 19:54:13 +0000 (UTC)
Author: sadam
Date: Mon Sep 1 19:54:13 2008
New Revision: 2427
URL: http://svn.gnome.org/viewvc/seahorse?rev=2427&view=rev
Log:
2008-09-01 Adam Schreiber <sadam clemson edu>
* src/seahorse-viewer.c:
* src/seahorse-viewer.vala:
* src/vala-build.stamp: Fix copying keys to clipboard. Fixes bug
#550279
Modified:
trunk/ChangeLog
trunk/src/seahorse-viewer.c
trunk/src/seahorse-viewer.vala
trunk/src/vala-build.stamp
Modified: trunk/src/seahorse-viewer.c
==============================================================================
--- trunk/src/seahorse-viewer.c (original)
+++ trunk/src/seahorse-viewer.c Mon Sep 1 19:54:13 2008
@@ -554,7 +554,7 @@
}
_tmp0 = NULL;
result = (_tmp0 = G_OBJECT (seahorse_operation_get_result (op)), (_tmp0 == NULL ? NULL : g_object_ref (_tmp0)));
- g_return_if_fail (result != NULL && G_TYPE_FROM_INSTANCE (result) != G_TYPE_MEMORY_OUTPUT_STREAM);
+ g_return_if_fail (result != NULL && G_TYPE_FROM_INSTANCE (result) == G_TYPE_MEMORY_OUTPUT_STREAM);
_tmp1 = NULL;
output = (_tmp1 = G_MEMORY_OUTPUT_STREAM (result), (_tmp1 == NULL ? NULL : g_object_ref (_tmp1)));
text = ((const char*) (g_memory_output_stream_get_data (output)));
Modified: trunk/src/seahorse-viewer.vala
==============================================================================
--- trunk/src/seahorse-viewer.vala (original)
+++ trunk/src/seahorse-viewer.vala Mon Sep 1 19:54:13 2008
@@ -349,7 +349,7 @@
}
GLib.Object result = (GLib.Object)op.get_result ();
- return_if_fail (result != null && result.get_type () != typeof (MemoryOutputStream));
+ return_if_fail (result != null && result.get_type () == typeof (MemoryOutputStream));
MemoryOutputStream output = (MemoryOutputStream)result;
weak string text = (string)output.get_data ();
Modified: trunk/src/vala-build.stamp
==============================================================================
--- trunk/src/vala-build.stamp (original)
+++ trunk/src/vala-build.stamp Mon Sep 1 19:54:13 2008
@@ -1 +1 @@
-1220213883
+1220298481
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]