seahorse r2276 - in trunk: . gkr libseahorse pgp src ssh

[nnielsen svn gnome org]

Author: nnielsen
Date: Wed Jul 16 17:34:47 2008
New Revision: 2276
URL: http://svn.gnome.org/viewvc/seahorse?rev=2276&view=rev

Log:
	* gkr/seahorse-gkeyring-source.c:
	* libseahorse/libseahorse-c.vapi:
	* libseahorse/seahorse-context.c:
	* libseahorse/seahorse-key-source.c:
	* libseahorse/seahorse-key-source.h:
	* libseahorse/seahorse-unknown-source.c:
	* pgp/seahorse-pgp-source.c:
	* pgp/seahorse-server-source.c:
	* ssh/seahorse-ssh-source.c: Remove unused stop() and get_state() 
	virtual methods of SeahorseKey
	
	* libseahorse/seahorse-prefs.c: Fix compiler warning

Modified:
   trunk/ChangeLog
   trunk/gkr/seahorse-gkeyring-source.c
   trunk/gkr/vala-build.stamp
   trunk/libseahorse/libseahorse-c.vapi
   trunk/libseahorse/seahorse-context.c
   trunk/libseahorse/seahorse-key-source.c
   trunk/libseahorse/seahorse-key-source.h
   trunk/libseahorse/seahorse-prefs.c
   trunk/libseahorse/seahorse-unknown-source.c
   trunk/pgp/seahorse-pgp-source.c
   trunk/pgp/seahorse-server-source.c
   trunk/pgp/vala-build.stamp
   trunk/src/vala-build.stamp
   trunk/ssh/seahorse-ssh-source.c
   trunk/ssh/vala-build.stamp

Modified: trunk/gkr/seahorse-gkeyring-source.c
==============================================================================
--- trunk/gkr/seahorse-gkeyring-source.c	(original)
+++ trunk/gkr/seahorse-gkeyring-source.c	Wed Jul 16 17:34:47 2008
@@ -588,31 +588,6 @@
     return SEAHORSE_OPERATION (lop);
 }
 
-static void
-seahorse_gkeyring_source_stop (SeahorseKeySource *src)
-{
-    SeahorseGKeyringSource *gsrc;
-    
-    g_assert (SEAHORSE_IS_KEY_SOURCE (src));
-    gsrc = SEAHORSE_GKEYRING_SOURCE (src);
-    
-    if(seahorse_operation_is_running (SEAHORSE_OPERATION (gsrc->pv->operations)))
-        seahorse_operation_cancel (SEAHORSE_OPERATION (gsrc->pv->operations));
-}
-
-static guint
-seahorse_gkeyring_source_get_state (SeahorseKeySource *src)
-{
-    SeahorseGKeyringSource *gsrc;
-    
-    g_assert (SEAHORSE_IS_KEY_SOURCE (src));
-    gsrc = SEAHORSE_GKEYRING_SOURCE (src);
-    
-    return seahorse_operation_is_running (SEAHORSE_OPERATION (gsrc->pv->operations)) ? 
-                                          SKSRC_LOADING : 0;
-}
-
-
 static SeahorseOperation* 
 seahorse_gkeyring_source_import (SeahorseKeySource *sksrc, GInputStream *input)
 {
@@ -729,8 +704,6 @@
     
     key_class = SEAHORSE_KEY_SOURCE_CLASS (klass);    
     key_class->load = seahorse_gkeyring_source_load;
-    key_class->stop = seahorse_gkeyring_source_stop;
-    key_class->get_state = seahorse_gkeyring_source_get_state;
     key_class->import = seahorse_gkeyring_source_import;
     key_class->export = seahorse_gkeyring_source_export;
     key_class->remove = seahorse_gkeyring_source_remove;

Modified: trunk/gkr/vala-build.stamp
==============================================================================
--- trunk/gkr/vala-build.stamp	(original)
+++ trunk/gkr/vala-build.stamp	Wed Jul 16 17:34:47 2008
@@ -1 +1 @@
-1216160617
+1216229805

Modified: trunk/libseahorse/libseahorse-c.vapi
==============================================================================
--- trunk/libseahorse/libseahorse-c.vapi	(original)
+++ trunk/libseahorse/libseahorse-c.vapi	Wed Jul 16 17:34:47 2008
@@ -27,8 +27,13 @@
 		public GLib.Quark ktype { get; }
 		public static Operation export_keys (GLib.List<Key> keys, GLib.OutputStream output);
 		public static void delete_keys (GLib.List<Key> keys) throws GLib.Error;
-		public Operation import (GLib.InputStream input);
-		public Operation load (GLib.Quark keyid);
+		
+		public virtual Operation load (GLib.Quark keyid);
+		public virtual Operation search (string match);
+		public virtual Operation import (GLib.InputStream input);
+		public virtual Operation export (GLib.List<weak Key> keys, bool complete, GLib.OutputStream output);
+		public virtual Operation export_raw (GLib.List<GLib.Quark> keyids, GLib.OutputStream output);
+		public virtual void remove (Key key, uint name) throws GLib.Error; 
         }
         
         [CCode (cheader_filename = "seahorse-key.h")]
@@ -93,6 +98,7 @@
 
 	[CCode (cheader_filename = "seahorse-operation.h")]
 	public class Operation : GLib.Object {
+		public Operation.complete();
 		public bool is_successful ();
 		public bool is_running ();
 		public void display_error (string heading, Gtk.Widget? parent);

Modified: trunk/libseahorse/seahorse-context.c
==============================================================================
--- trunk/libseahorse/seahorse-context.c	(original)
+++ trunk/libseahorse/seahorse-context.c	Wed Jul 16 17:34:47 2008
@@ -163,10 +163,8 @@
     sctx->pv->discovery = NULL;
         
     /* Release all the sources */
-    for (l = sctx->pv->sources; l; l = g_slist_next (l)) {
-        seahorse_key_source_stop (SEAHORSE_KEY_SOURCE (l->data));
+    for (l = sctx->pv->sources; l; l = g_slist_next (l))
         g_object_unref (SEAHORSE_KEY_SOURCE (l->data));
-    }
     g_slist_free (sctx->pv->sources);
     sctx->pv->sources = NULL;
     

Modified: trunk/libseahorse/seahorse-key-source.c
==============================================================================
--- trunk/libseahorse/seahorse-key-source.c	(original)
+++ trunk/libseahorse/seahorse-key-source.c	Wed Jul 16 17:34:47 2008
@@ -142,44 +142,6 @@
     return (*klass->search) (sksrc, match);
 }
 
-/**
- * seahorse_key_source_stop
- * @sksrc: A #SeahorseKeySource object
- * 
- * Stops all load operations on the #SeahorseKeySource.
- **/
-void
-seahorse_key_source_stop (SeahorseKeySource *sksrc)
-{
-    SeahorseKeySourceClass *klass;
-    
-    g_return_if_fail (SEAHORSE_IS_KEY_SOURCE (sksrc));
-    klass = SEAHORSE_KEY_SOURCE_GET_CLASS (sksrc);
-    g_return_if_fail (klass->stop != NULL);
-    
-    (*klass->stop) (sksrc);
-}
-
-/**
- * seahorse_key_source_get_state
- * @sksrc: A #SeahorseKeySource object
- * 
- * Gets the internal status of the key source object.
- * 
- * Returns: A combination of flags from seahorse-key-source.h
- **/
-guint
-seahorse_key_source_get_state (SeahorseKeySource *sksrc)
-{
-    SeahorseKeySourceClass *klass;
-    
-    g_return_val_if_fail (SEAHORSE_IS_KEY_SOURCE (sksrc), 0);
-    klass = SEAHORSE_KEY_SOURCE_GET_CLASS (sksrc);   
-    g_return_val_if_fail (klass->get_state != NULL, 0);
-    
-    return (*klass->get_state) (sksrc);
-}
-
 SeahorseOperation* 
 seahorse_key_source_import (SeahorseKeySource *sksrc, GInputStream *input)
 {

Modified: trunk/libseahorse/seahorse-key-source.h
==============================================================================
--- trunk/libseahorse/seahorse-key-source.h	(original)
+++ trunk/libseahorse/seahorse-key-source.h	Wed Jul 16 17:34:47 2008
@@ -59,12 +59,6 @@
     GObject             parent;   
 } SeahorseKeySource;
 
-/* Flags for the get_state method below */
-typedef enum {
-    SKSRC_REMOTE  = 0x00000001,
-    SKSRC_LOADING = 0x00000010
-} SeahorseKeySourceFlags;
-
 typedef struct _SeahorseKeySourceClass {
     GtkObjectClass parent_class;
     
@@ -103,17 +97,6 @@
 
     
     /**
-     * stop
-     * @sksrc: The #SeahorseKeySource.
-     * 
-     * Stops any operations in progress. (ie: load, import, export etc...)
-     */
-    void (*stop) (SeahorseKeySource *sksrc);
-    
-    /* Get the flags for this key source */
-    guint (*get_state) (SeahorseKeySource *sksrc);
-    
-    /**
      * import
      * @sksrc: The #SeahorseKeySource to import into.
      * @input: The data to import.
@@ -175,8 +158,6 @@
 /* Method helper functions ------------------------------------------- */
 
 
-guint               seahorse_key_source_get_state        (SeahorseKeySource *sksrc);
-
 SeahorseOperation*  seahorse_key_source_load             (SeahorseKeySource *sksrc,
                                                           GQuark keyid);
                                                           
@@ -213,8 +194,6 @@
                                                           GSList *keyids, 
                                                           GOutputStream *output);
 
-void                seahorse_key_source_stop             (SeahorseKeySource *sksrc);
-
 gboolean            seahorse_key_source_remove           (SeahorseKeySource *sksrc,
                                                           SeahorseKey *skey,
                                                           guint name,

Modified: trunk/libseahorse/seahorse-prefs.c
==============================================================================
--- trunk/libseahorse/seahorse-prefs.c	(original)
+++ trunk/libseahorse/seahorse-prefs.c	Wed Jul 16 17:34:47 2008
@@ -481,7 +481,9 @@
 seahorse_prefs_new (GtkWindow *parent)
 {
     SeahorseWidget *swidget;
+#ifndef WITH_KEYSERVER
     GtkWidget *widget = NULL;
+#endif
     
     swidget = seahorse_widget_new ("prefs", parent);
     

Modified: trunk/libseahorse/seahorse-unknown-source.c
==============================================================================
--- trunk/libseahorse/seahorse-unknown-source.c	(original)
+++ trunk/libseahorse/seahorse-unknown-source.c	Wed Jul 16 17:34:47 2008
@@ -68,18 +68,6 @@
     return seahorse_operation_new_complete (NULL);
 }
 
-static void
-seahorse_unknown_source_stop (SeahorseKeySource *src)
-{
-
-}
-
-static guint
-seahorse_unknown_source_get_state (SeahorseKeySource *src)
-{
-    return 0;
-}
-
 static SeahorseOperation* 
 seahorse_unknown_source_import (SeahorseKeySource *sksrc, GInputStream *input)
 {
@@ -154,8 +142,6 @@
     gobject_class->get_property = seahorse_unknown_source_get_property;
     
     parent_class->load = seahorse_unknown_source_load;
-    parent_class->stop = seahorse_unknown_source_stop;
-    parent_class->get_state = seahorse_unknown_source_get_state;
     parent_class->import = seahorse_unknown_source_import;
     parent_class->export_raw = seahorse_unknown_source_export_raw;
     parent_class->remove = seahorse_unknown_source_remove;

Modified: trunk/pgp/seahorse-pgp-source.c
==============================================================================
--- trunk/pgp/seahorse-pgp-source.c	(original)
+++ trunk/pgp/seahorse-pgp-source.c	Wed Jul 16 17:34:47 2008
@@ -260,8 +260,6 @@
                                                  GValue *value, GParamSpec *pspec);
 
 /* SeahorseKeySource methods */
-static void                seahorse_pgp_source_stop             (SeahorseKeySource *src);
-static guint               seahorse_pgp_source_get_state        (SeahorseKeySource *src);
 static SeahorseOperation*  seahorse_pgp_source_load             (SeahorseKeySource *src,
                                                                  GQuark keyid);
 static SeahorseOperation*  seahorse_pgp_source_import           (SeahorseKeySource *sksrc, 
@@ -309,8 +307,6 @@
     key_class = SEAHORSE_KEY_SOURCE_CLASS (klass);
     key_class->canonize_keyid = seahorse_pgp_key_get_cannonical_id;
     key_class->load = seahorse_pgp_source_load;
-    key_class->stop = seahorse_pgp_source_stop;
-    key_class->get_state = seahorse_pgp_source_get_state;
     key_class->import = seahorse_pgp_source_import;
     key_class->export = seahorse_pgp_source_export;
     key_class->remove = seahorse_pgp_source_remove;
@@ -990,30 +986,6 @@
     return SEAHORSE_OPERATION (psrc->pv->operations);
 }
 
-static void
-seahorse_pgp_source_stop (SeahorseKeySource *src)
-{
-    SeahorsePGPSource *psrc;
-    
-    g_assert (SEAHORSE_IS_KEY_SOURCE (src));
-    psrc = SEAHORSE_PGP_SOURCE (src);
-    
-    if(seahorse_operation_is_running (SEAHORSE_OPERATION (psrc->pv->operations)))
-        seahorse_operation_cancel (SEAHORSE_OPERATION (psrc->pv->operations));
-}
-
-static guint
-seahorse_pgp_source_get_state (SeahorseKeySource *src)
-{
-    SeahorsePGPSource *psrc;
-    
-    g_assert (SEAHORSE_IS_KEY_SOURCE (src));
-    psrc = SEAHORSE_PGP_SOURCE (src);
-    
-    return seahorse_operation_is_running (SEAHORSE_OPERATION (psrc->pv->operations)) ? 
-                                          SKSRC_LOADING : 0;
-}
-
 static SeahorseOperation* 
 seahorse_pgp_source_import (SeahorseKeySource *sksrc, GInputStream *input)
 {

Modified: trunk/pgp/seahorse-server-source.c
==============================================================================
--- trunk/pgp/seahorse-server-source.c	(original)
+++ trunk/pgp/seahorse-server-source.c	Wed Jul 16 17:34:47 2008
@@ -64,8 +64,6 @@
                                                const GValue *value, GParamSpec *pspec);
                                                
 /* SeahorseKeySource methods */
-static void         seahorse_server_source_stop        (SeahorseKeySource *src);
-static guint        seahorse_server_source_get_state   (SeahorseKeySource *src);
 static SeahorseOperation*  seahorse_server_source_load (SeahorseKeySource *src, GQuark keyid);
 
 static GObjectClass *parent_class = NULL;
@@ -84,8 +82,6 @@
         
     key_class->canonize_keyid = seahorse_pgp_key_get_cannonical_id;
     key_class->load = seahorse_server_source_load;
-    key_class->stop = seahorse_server_source_stop;
-    key_class->get_state = seahorse_server_source_get_state;
     
     gobject_class->dispose = seahorse_server_source_dispose;
     gobject_class->finalize = seahorse_server_source_finalize;
@@ -325,32 +321,6 @@
     return NULL;
 }
 
-static void
-seahorse_server_source_stop (SeahorseKeySource *src)
-{
-    SeahorseServerSource *ssrc;
-    
-    g_assert (SEAHORSE_IS_KEY_SOURCE (src));
-    ssrc = SEAHORSE_SERVER_SOURCE (src);
-
-    if(seahorse_operation_is_running (SEAHORSE_OPERATION (ssrc->priv->mop)))
-        seahorse_operation_cancel (SEAHORSE_OPERATION (ssrc->priv->mop));
-}
-
-static guint
-seahorse_server_source_get_state (SeahorseKeySource *src)
-{
-    SeahorseServerSource *ssrc;
-    
-    g_assert (SEAHORSE_IS_SERVER_SOURCE (src));
-    ssrc = SEAHORSE_SERVER_SOURCE (src);
-    
-    guint state = SKSRC_REMOTE;
-    if (seahorse_operation_is_running (SEAHORSE_OPERATION (ssrc->priv->mop)))
-        state |= SKSRC_LOADING;
-    return state;
-}
-
 /* Code adapted from GnuPG (file g10/keyserver.c) */
 static gboolean 
 parse_keyserver_uri (char *uri, const char **scheme, const char **host)

Modified: trunk/pgp/vala-build.stamp
==============================================================================
--- trunk/pgp/vala-build.stamp	(original)
+++ trunk/pgp/vala-build.stamp	Wed Jul 16 17:34:47 2008
@@ -1 +1 @@
-1216160621
+1216229823

Modified: trunk/src/vala-build.stamp
==============================================================================
--- trunk/src/vala-build.stamp	(original)
+++ trunk/src/vala-build.stamp	Wed Jul 16 17:34:47 2008
@@ -1 +1 @@
-1216160634
+1216229895

Modified: trunk/ssh/seahorse-ssh-source.c
==============================================================================
--- trunk/ssh/seahorse-ssh-source.c	(original)
+++ trunk/ssh/seahorse-ssh-source.c	Wed Jul 16 17:34:47 2008
@@ -557,18 +557,6 @@
     return seahorse_operation_new_complete (NULL);
 }
 
-static void
-seahorse_ssh_source_stop (SeahorseKeySource *src)
-{
-
-}
-
-static guint
-seahorse_ssh_source_get_state (SeahorseKeySource *src)
-{
-    return 0;
-}
-
 static SeahorseOperation* 
 seahorse_ssh_source_import (SeahorseKeySource *sksrc, GInputStream *input)
 {
@@ -843,8 +831,6 @@
     
     parent_class->canonize_keyid = seahorse_ssh_key_get_cannonical_id;
     parent_class->load = seahorse_ssh_source_load;
-    parent_class->stop = seahorse_ssh_source_stop;
-    parent_class->get_state = seahorse_ssh_source_get_state;
     parent_class->import = seahorse_ssh_source_import;
     parent_class->export = seahorse_ssh_source_export;
     parent_class->remove = seahorse_ssh_source_remove;

Modified: trunk/ssh/vala-build.stamp
==============================================================================
--- trunk/ssh/vala-build.stamp	(original)
+++ trunk/ssh/vala-build.stamp	Wed Jul 16 17:34:47 2008
@@ -1 +1 @@
-1216160626
+1216229865