[seahorse] Fixed warnings compiling seahorse

[Stefan Walter <stefw src gnome org>]

commit 1cc4a05280e68bc0702dcf608f3af6eaf2dec0e6
Author: Pablo Castellano <pablog ubuntu gmail com>
Date:   Mon Aug 24 14:48:55 2009 +0200

    Fixed warnings compiling seahorse
    
    Signed-off-by: Stef Walter <stef memberwebs com>

 pgp/seahorse-hkp-source.c         |    2 +-
 src/seahorse-viewer.c             |    2 +-
 ssh/seahorse-ssh-generate.c       |    2 +-
 ssh/seahorse-ssh-key-properties.c |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/pgp/seahorse-hkp-source.c b/pgp/seahorse-hkp-source.c
index 9967f21..f0629ae 100644
--- a/pgp/seahorse-hkp-source.c
+++ b/pgp/seahorse-hkp-source.c
@@ -780,7 +780,7 @@ is_hex_keyid (const gchar *match)
     if (strlen (match) != 8)
         return FALSE;
     
-    while (*t != NULL) {
+    while (*t != '\0') {
         if (!((*t >= 0x30 && *t <= 0x39) || (*t >= 0x41 && *t <= 0x46) || (*t >= 0x61 && *t <= 0x66)))
             return FALSE;
             
diff --git a/src/seahorse-viewer.c b/src/seahorse-viewer.c
index 9ae3667..0494dd2 100644
--- a/src/seahorse-viewer.c
+++ b/src/seahorse-viewer.c
@@ -195,7 +195,7 @@ static const GtkActionEntry UI_ENTRIES[] = {
 	{ "edit-menu", NULL, N_("_Edit") },
 	{ "view-menu", NULL, N_("_View") },
 	{ "help-menu", NULL, N_("_Help") },
-#ifdef  WITH_KEYSERVER || WITH_SHARING
+#if defined (WITH_KEYSERVER) || defined (WITH_SHARING)
 	{ "app-preferences", GTK_STOCK_PREFERENCES, N_("Prefere_nces"), NULL,
 	  N_("Change preferences for this program"), G_CALLBACK (on_app_preferences) },
 #endif
diff --git a/ssh/seahorse-ssh-generate.c b/ssh/seahorse-ssh-generate.c
index 3e21580..48e2de9 100644
--- a/ssh/seahorse-ssh-generate.c
+++ b/ssh/seahorse-ssh-generate.c
@@ -71,7 +71,7 @@ seahorse_ssh_generate_register (void)
 	gtk_action_group_add_actions (actions, ACTION_ENTRIES, G_N_ELEMENTS (ACTION_ENTRIES), NULL);
 	
 	/* Register this as a generator */
-	seahorse_registry_register_object (NULL, actions, SEAHORSE_SSH_TYPE_STR, "generator", NULL);
+	seahorse_registry_register_object (NULL, G_OBJECT (actions), SEAHORSE_SSH_TYPE_STR, "generator", NULL);
 }
 
 /* --------------------------------------------------------------------
diff --git a/ssh/seahorse-ssh-key-properties.c b/ssh/seahorse-ssh-key-properties.c
index 241748a..083f3d3 100644
--- a/ssh/seahorse-ssh-key-properties.c
+++ b/ssh/seahorse-ssh-key-properties.c
@@ -231,13 +231,13 @@ do_main (SeahorseWidget *swidget)
     skey = SEAHORSE_SSH_KEY (object);
 
     /* Image */
-    widget = gtk_builder_get_object (swidget->gtkbuilder, "key-image");
+    widget = GTK_WIDGET (gtk_builder_get_object (swidget->gtkbuilder, "key-image"));
     if (widget)
         gtk_image_set_from_stock (GTK_IMAGE (widget), SEAHORSE_STOCK_KEY_SSH, GTK_ICON_SIZE_DIALOG);
 
     /* Name and title */
     label = seahorse_object_get_label (object);
-    widget = gtk_builder_get_object (swidget->gtkbuilder, "comment-entry");
+    widget = GTK_WIDGET (gtk_builder_get_object (swidget->gtkbuilder, "comment-entry"));
     if (widget)
         gtk_entry_set_text (GTK_ENTRY (widget), label);
     widget = seahorse_widget_get_toplevel (swidget);