[Spice-devel] [spice-gtk 4/4] smartcard: Move down spice_smartcard_reader_is_software body

Christophe Fergeau cfergeau at redhat.com
Wed Jun 19 08:33:27 PDT 2013


It's more consistent to have it close to
spice_smartcard_reader_insert_card() et al.
---
 gtk/smartcard-manager.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/gtk/smartcard-manager.c b/gtk/smartcard-manager.c
index 6709d56..edc338b 100644
--- a/gtk/smartcard-manager.c
+++ b/gtk/smartcard-manager.c
@@ -402,21 +402,6 @@ spice_smartcard_manager_update_monitor(void)
 
 #define SPICE_SOFTWARE_READER_NAME "Spice Software Smartcard"
 
-/**
- * spice_smartcard_reader_is_software:
- * @reader: a #SpiceSmartcardReader
- *
- * Tests if @reader is a software (emulated) smartcard reader.
- *
- * Returns: TRUE if @reader is a software (emulated) smartcard reader,
- * FALSE otherwise
- */
-gboolean spice_smartcard_reader_is_software(SpiceSmartcardReader *reader)
-{
-    g_return_val_if_fail(reader != NULL, FALSE);
-    return (strcmp(vreader_get_name((VReader*)reader), SPICE_SOFTWARE_READER_NAME) == 0);
-}
-
 static gboolean smartcard_manager_init(SpiceSession *session,
                                        GCancellable *cancellable,
                                        GError **err)
@@ -536,6 +521,21 @@ gboolean spice_smartcard_manager_init_finish(SpiceSession *session,
 }
 
 /**
+ * spice_smartcard_reader_is_software:
+ * @reader: a #SpiceSmartcardReader
+ *
+ * Tests if @reader is a software (emulated) smartcard reader.
+ *
+ * Returns: TRUE if @reader is a software (emulated) smartcard reader,
+ * FALSE otherwise
+ */
+gboolean spice_smartcard_reader_is_software(SpiceSmartcardReader *reader)
+{
+    g_return_val_if_fail(reader != NULL, FALSE);
+    return (strcmp(vreader_get_name((VReader*)reader), SPICE_SOFTWARE_READER_NAME) == 0);
+}
+
+/**
  * spice_smartcard_reader_insert_card:
  * @reader: a #SpiceSmartcardReader
  *
-- 
1.8.2.1



More information about the Spice-devel mailing list