seahorse r2428 - in trunk: . src

[sadam svn gnome org]

Author: sadam
Date: Mon Sep  1 20:08:42 2008
New Revision: 2428
URL: http://svn.gnome.org/viewvc/seahorse?rev=2428&view=rev

Log:
2008-09-01  Adam Schreiber  <sadam clemson edu>

    * src/seahorse-viewer.c:
    * src/seahorse-viewer.vala:
    * src/vala-build.stamp: Fix some more logic.


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 20:08:42 2008
@@ -699,7 +699,7 @@
 	g_return_if_fail (text != NULL);
 	_tmp0 = NULL;
 	widget = (_tmp0 = seahorse_widget_get_widget (SEAHORSE_WIDGET (self), "status"), (_tmp0 == NULL ? NULL : g_object_ref (_tmp0)));
-	g_return_if_fail (widget != NULL || G_TYPE_FROM_INSTANCE (G_OBJECT (widget)) != GTK_TYPE_STATUSBAR);
+	g_return_if_fail (widget != NULL && G_TYPE_FROM_INSTANCE (G_OBJECT (widget)) == GTK_TYPE_STATUSBAR);
 	_tmp1 = NULL;
 	status = (_tmp1 = GTK_STATUSBAR (widget), (_tmp1 == NULL ? NULL : g_object_ref (_tmp1)));
 	id = gtk_statusbar_get_context_id (status, "key-manager");

Modified: trunk/src/seahorse-viewer.vala
==============================================================================
--- trunk/src/seahorse-viewer.vala	(original)
+++ trunk/src/seahorse-viewer.vala	Mon Sep  1 20:08:42 2008
@@ -419,7 +419,7 @@
 		
 		protected void set_status (string text) {
 			Gtk.Widget widget = get_widget ("status");
-			return_if_fail (widget != null || widget.get_type() != typeof (Gtk.Statusbar));
+			return_if_fail (widget != null && widget.get_type() == typeof (Gtk.Statusbar));
 			
 			Gtk.Statusbar status = (Gtk.Statusbar)widget;
 			uint id = status.get_context_id ("key-manager");

Modified: trunk/src/vala-build.stamp
==============================================================================
--- trunk/src/vala-build.stamp	(original)
+++ trunk/src/vala-build.stamp	Mon Sep  1 20:08:42 2008
@@ -1 +1 @@
-1220298481
+1220299564