GNOME.org
 

[gnome-keyring] gcr: Fix documentation, abi, and translation issues

commit c6d34ef32a6e6ffff38bdbc7f177a88c9e6bf680
Author: Stef Walter <stefw collabora co uk>
Date:   Tue Sep 27 17:12:02 2011 +0200

    gcr: Fix documentation, abi, and translation issues

 docs/reference/gcr/Makefile.am      |    3 +
 docs/reference/gcr/gcr-sections.txt |   22 +++++--
 docs/reference/gcr/gcr.types        |    1 +
 gcr/Makefile.am                     |    4 +-
 gcr/gcr-base.symbols                |   19 ++++++-
 gcr/gcr-collection-model.c          |   21 ++++++-
 gcr/gcr-combo-selector.c            |    2 +-
 gcr/gcr-combo-selector.h            |    2 -
 gcr/gcr-deprecated-base.h           |   16 +++++
 gcr/gcr-import-button.c             |   15 +++++
 gcr/gcr-import-button.h             |    2 +-
 gcr/gcr-importer.c                  |  104 ++++++++++++++++++++++++++++++++++-
 gcr/gcr-list-selector.c             |    4 +-
 gcr/gcr-list-selector.h             |    2 -
 gcr/gcr-parser.c                    |   42 ++++++++++++++-
 gcr/gcr-viewer-tool.c               |    4 +-
 gcr/gcr-viewer-window.c             |   16 +++---
 gcr/gcr-viewer-window.h             |   14 +++--
 gcr/gcr.symbols                     |   10 +++
 gcr/tests/frob-unlock.c             |    2 +-
 po/POTFILES.in                      |    3 +
 21 files changed, 270 insertions(+), 38 deletions(-)
---
diff --git a/docs/reference/gcr/Makefile.am b/docs/reference/gcr/Makefile.am
index aa940d2..4c3e870 100644
--- a/docs/reference/gcr/Makefile.am
+++ b/docs/reference/gcr/Makefile.am
@@ -61,6 +61,8 @@ IGNORE_HFILES= \
 	gcr-certificate-exporter.h \
 	gcr-certificate-basics-widget.h \
 	gcr-certificate-details-widget.h \
+	gcr-deprecated.h \
+	gcr-deprecated-base.h \
 	gcr-display-scrolled.h \
 	gcr-display-view.h \
 	gcr-failure-renderer.h \
@@ -74,6 +76,7 @@ IGNORE_HFILES= \
 	gcr-openpgp.h \
 	gcr-pkcs11-renderer.h \
 	gcr-record.h \
+	gcr-single-collection.h \
 	gcr-unlock-renderer.h \
 	gcr-viewer-window.h \
 	gcr-xxx.h \
diff --git a/docs/reference/gcr/gcr-sections.txt b/docs/reference/gcr/gcr-sections.txt
index 6f0fd8b..584eb03 100644
--- a/docs/reference/gcr/gcr-sections.txt
+++ b/docs/reference/gcr/gcr-sections.txt
@@ -20,8 +20,19 @@ gcr_parser_get_parsed_description
 gcr_parser_get_parsed_attributes
 gcr_parser_get_parsed_block
 gcr_parser_get_parsed_format
+GcrParsed
+gcr_parsed_ref
+gcr_parsed_unref
+gcr_parsed_get_attributes
+gcr_parsed_get_data
+gcr_parsed_get_description
+gcr_parsed_get_format
+gcr_parsed_get_label
+gcr_parser_get_parsed
 <SUBSECTION Standard>
+GCR_TYPE_PARSED
 GcrParserPrivate
+gcr_parsed_get_type
 GCR_PARSER
 GCR_IS_PARSER
 GCR_TYPE_PARSER
@@ -194,6 +205,9 @@ gcr_trust_remove_pinned_certificate_finish
 
 <SECTION>
 <FILE>gcr-library</FILE>
+gcr_pkcs11_initialize
+gcr_pkcs11_initialize_async
+gcr_pkcs11_initialize_finish
 gcr_pkcs11_get_modules
 gcr_pkcs11_set_modules
 gcr_pkcs11_add_module
@@ -277,7 +291,6 @@ GcrSimpleCollectionClass
 gcr_simple_collection_new
 gcr_simple_collection_add
 gcr_simple_collection_remove
-gcr_simple_collection_contains
 <SUBSECTION Standard>
 gcr_simple_collection_get_type
 GCR_IS_SIMPLE_COLLECTION
@@ -372,7 +385,6 @@ GcrListSelector
 GcrListSelectorClass
 gcr_list_selector_new
 gcr_list_selector_get_collection
-gcr_list_selector_get_columns
 gcr_list_selector_get_selected
 gcr_list_selector_set_selected
 <SUBSECTION Standard>
@@ -391,7 +403,6 @@ GCR_TYPE_LIST_SELECTOR
 GcrComboSelector
 GcrComboSelectorClass
 gcr_combo_selector_get_collection
-gcr_combo_selector_get_columns
 gcr_combo_selector_new
 gcr_combo_selector_get_selected
 gcr_combo_selector_set_selected
@@ -413,7 +424,6 @@ GcrRendererIface
 gcr_renderer_create
 gcr_renderer_register
 gcr_renderer_popuplate_popup
-gcr_renderer_render
 gcr_renderer_render_view
 gcr_renderer_emit_data_changed
 gcr_renderer_register_well_known
@@ -602,8 +612,6 @@ GCR_TYPE_MEMORY_ICON
 GcrMemoryIcon
 GcrMemoryIconClass
 GcrMemoryIconPrivate
-GCR_ERROR
-gcr_error_get_domain
 GcrOpensshPubCallback
 GCR_CALLBACK_OUTPUT_STREAM
 GCR_CALLBACK_OUTPUT_STREAM_CLASS
@@ -614,4 +622,6 @@ GCR_TYPE_CALLBACK_OUTPUT_STREAM
 GcrCallbackOutputFunc
 GcrCallbackOutputStream
 GcrCallbackOutputStreamClass
+GCR_TYPE_IMPORTER_PROMPT_BEHAVIOR
+gcr_importer_prompt_behavior_get_type
 </SECTION>
diff --git a/docs/reference/gcr/gcr.types b/docs/reference/gcr/gcr.types
index 7838906..fcd2dd9 100644
--- a/docs/reference/gcr/gcr.types
+++ b/docs/reference/gcr/gcr.types
@@ -21,3 +21,4 @@ gcr_union_collection_get_type
 gcr_unlock_options_widget_get_type
 gcr_viewer_get_type
 gcr_viewer_widget_get_type
+gcr_viewer_window_get_type
\ No newline at end of file
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index 2b981a2..9d0da44 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -158,6 +158,7 @@ libgcr_ GCR_MAJOR@_la_SOURCES = \
 	gcr-unlock-renderer.c gcr-unlock-renderer.h \
 	gcr-viewer.c gcr-viewer.h \
 	gcr-viewer-widget.c gcr-viewer-widget.h \
+	gcr-viewer-window.c gcr-viewer-window.h \
 	$(BUILT_UI_FILES)
 
 libgcr_base_ GCR_MAJOR@_la_CFLAGS = \
@@ -274,8 +275,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 bin_PROGRAMS = gcr-viewer
 
 gcr_viewer_SOURCES = \
-	gcr-viewer-tool.c \
-	gcr-viewer-window.c gcr-viewer-window.h
+	gcr-viewer-tool.c
 
 gcr_viewer_CFLAGS = \
 	$(GTK_CFLAGS) \
diff --git a/gcr/gcr-base.symbols b/gcr/gcr-base.symbols
index 015543c..3fa657e 100644
--- a/gcr/gcr-base.symbols
+++ b/gcr/gcr-base.symbols
@@ -52,22 +52,36 @@ gcr_data_error_get_domain
 gcr_data_error_get_type
 gcr_data_format_get_type
 gcr_error_get_domain
+gcr_icon_for_token_info
+gcr_importer_create_for_parsed
 gcr_importer_get_parser
 gcr_importer_get_prompt_behavior
 gcr_importer_get_slot
-gcr_importer_create_for_parsed
 gcr_importer_get_type
 gcr_importer_import
 gcr_importer_import_async
 gcr_importer_import_finish
+gcr_importer_prompt_behavior_get_type
 gcr_importer_queue_and_filter_for_parsed
 gcr_importer_queue_for_parsed
 gcr_importer_register
 gcr_importer_register_well_known
+gcr_importer_set_parser
+gcr_importer_set_prompt_behavior
+gcr_importer_set_slot
+gcr_parsed_get_attributes
+gcr_parsed_get_data
+gcr_parsed_get_description
+gcr_parsed_get_format
+gcr_parsed_get_label
+gcr_parsed_get_type
+gcr_parsed_ref
+gcr_parsed_unref
 gcr_parser_add_password
 gcr_parser_format_disable
 gcr_parser_format_enable
 gcr_parser_format_supported
+gcr_parser_get_parsed
 gcr_parser_get_parsed_attributes
 gcr_parser_get_parsed_block
 gcr_parser_get_parsed_description
@@ -91,6 +105,9 @@ gcr_pkcs11_get_trust_lookup_slots
 gcr_pkcs11_get_trust_lookup_uris
 gcr_pkcs11_get_trust_store_slot
 gcr_pkcs11_get_trust_store_uri
+gcr_pkcs11_initialize
+gcr_pkcs11_initialize_async
+gcr_pkcs11_initialize_finish
 gcr_pkcs11_set_modules
 gcr_pkcs11_set_trust_lookup_uris
 gcr_pkcs11_set_trust_store_uri
diff --git a/gcr/gcr-collection-model.c b/gcr/gcr-collection-model.c
index c5ebe07..21b3fef 100644
--- a/gcr/gcr-collection-model.c
+++ b/gcr/gcr-collection-model.c
@@ -1501,7 +1501,16 @@ gcr_collection_model_is_selected (GcrCollectionModel *self, GtkTreeIter *iter)
 	return g_hash_table_lookup (self->pv->selected, object) ? TRUE : FALSE;
 }
 
-GList*
+/**
+ * gcr_collection_model_get_selected_objects:
+ * @self: the collection model
+ *
+ * Get a list of checked/selected objects.
+ *
+ * Returns: a list of selected objects, which should be freed with
+ *          g_list_free().
+ */
+GList *
 gcr_collection_model_get_selected_objects (GcrCollectionModel *self)
 {
 	GHashTableIter iter;
@@ -1519,8 +1528,16 @@ gcr_collection_model_get_selected_objects (GcrCollectionModel *self)
 	return result;
 }
 
+/**
+ * gcr_collection_model_set_selected_objects:
+ * @self: the collection model
+ * @selected: a list of objects to select
+ *
+ * Set the checked/selected objects.
+ */
 void
-gcr_collection_model_set_selected_objects (GcrCollectionModel *self, GList *selected)
+gcr_collection_model_set_selected_objects (GcrCollectionModel *self,
+                                           GList *selected)
 {
 	GHashTable *newly_selected;
 	GList *old_selection;
diff --git a/gcr/gcr-combo-selector.c b/gcr/gcr-combo-selector.c
index 6811139..bc33e78 100644
--- a/gcr/gcr-combo-selector.c
+++ b/gcr/gcr-combo-selector.c
@@ -194,7 +194,7 @@ gcr_combo_selector_class_init (GcrComboSelectorClass *klass)
  */
 
 /**
- * gcr_selector_new:
+ * gcr_combo_selector_new:
  * @collection: The collection that contains the objects to display
  *
  * Create a new #GcrTreeSelector.
diff --git a/gcr/gcr-combo-selector.h b/gcr/gcr-combo-selector.h
index 8fcb05e..2e519a0 100644
--- a/gcr/gcr-combo-selector.h
+++ b/gcr/gcr-combo-selector.h
@@ -57,8 +57,6 @@ GcrComboSelector*        gcr_combo_selector_new              (GcrCollection *col
 
 GcrCollection*           gcr_combo_selector_get_collection   (GcrComboSelector *self);
 
-const GcrColumn*         gcr_combo_selector_get_columns      (GcrComboSelector *self);
-
 GObject*                 gcr_combo_selector_get_selected     (GcrComboSelector *self);
 
 void                     gcr_combo_selector_set_selected     (GcrComboSelector *self,
diff --git a/gcr/gcr-deprecated-base.h b/gcr/gcr-deprecated-base.h
index b853670..9f52535 100644
--- a/gcr/gcr-deprecated-base.h
+++ b/gcr/gcr-deprecated-base.h
@@ -49,6 +49,22 @@ GcrParser *       gcr_importer_get_parser                     (GcrImporter *self
 void              gcr_importer_set_parser                     (GcrImporter *self,
                                                                GcrParser *parser);
 
+GckSlot *         gcr_importer_get_slot                       (GcrImporter *self);
+
+void              gcr_importer_set_slot                       (GcrImporter *self,
+                                                               GckSlot *slot);
+
+typedef enum {
+	GCR_IMPORTER_PROMPT_NEEDED,
+	GCR_IMPORTER_PROMPT_ALWAYS,
+	GCR_IMPORTER_PROMPT_NEVER
+} GcrImporterPromptBehavior;
+
+GcrImporterPromptBehavior  gcr_importer_get_prompt_behavior   (GcrImporter *self);
+
+void                       gcr_importer_set_prompt_behavior   (GcrImporter *self,
+                                                               GcrImporterPromptBehavior behavior);
+
 G_END_DECLS
 
 #endif /* GCR_DISABLE_DEPRECATED */
diff --git a/gcr/gcr-import-button.c b/gcr/gcr-import-button.c
index 6ae289d..5eab5a9 100644
--- a/gcr/gcr-import-button.c
+++ b/gcr/gcr-import-button.c
@@ -486,6 +486,14 @@ gcr_import_button_class_init (GcrImportButtonClass *klass)
 	g_type_class_add_private (klass, sizeof (GcrImportButtonPrivate));
 }
 
+/**
+ * gcr_import_button_new:
+ * @label: label to display on the button
+ *
+ * Create a new #GcrImportButton.
+ *
+ * Returns: a newly created #GcrImportButton
+ */
 GcrImportButton*
 gcr_import_button_new (const gchar *label)
 {
@@ -494,6 +502,13 @@ gcr_import_button_new (const gchar *label)
 	                     NULL);
 }
 
+/**
+ * gcr_import_button_add_parsed:
+ * @self: an import button
+ * @parsed: a parsed item
+ *
+ * Queue an item to import via the button
+ */
 void
 gcr_import_button_add_parsed (GcrImportButton *self,
                               GcrParsed *parsed)
diff --git a/gcr/gcr-import-button.h b/gcr/gcr-import-button.h
index 3df1240..6c839fc 100644
--- a/gcr/gcr-import-button.h
+++ b/gcr/gcr-import-button.h
@@ -60,7 +60,7 @@ GType               gcr_import_button_get_type               (void) G_GNUC_CONST
 
 GcrImportButton *   gcr_import_button_new                    (const gchar *label);
 
-void                gcr_import_button_add_parsed             (GcrImportButton *button,
+void                gcr_import_button_add_parsed             (GcrImportButton *self,
                                                               GcrParsed *parsed);
 
 G_END_DECLS
diff --git a/gcr/gcr-importer.c b/gcr/gcr-importer.c
index 658bc32..e44647c 100644
--- a/gcr/gcr-importer.c
+++ b/gcr/gcr-importer.c
@@ -246,7 +246,7 @@ gcr_importer_create_for_parsed (GcrParsed *parsed)
 /**
  * gcr_importer_queue_for_parsed:
  * @importer: an importer to add additional items to
- * @parser: a parser with a parsed item to import
+ * @parsed: a parsed item to import
  *
  * Queues an additional item to be imported. The parsed item is represented
  * by the state of the #GcrParser at the time of calling this method.
@@ -275,7 +275,7 @@ gcr_importer_queue_for_parsed (GcrImporter *importer,
 /**
  * gcr_importer_queue_and_filter_for_parsed:
  * @importers: a set of importers
- * @parser: a parser with a parsed item to import
+ * @parsed: a parsed item
  *
  * Queues an additional item to be imported in all compattible importers
  * in the set. The parsed item is represented by the state of the #GcrParser
@@ -476,3 +476,103 @@ gcr_importer_register_well_known (void)
 	g_type_class_unref (g_type_class_ref (GCR_TYPE_PKCS11_IMPORTER));
 	g_type_class_unref (g_type_class_ref (GCR_TYPE_GNUPG_IMPORTER));
 }
+
+#ifndef GCR_DISABLE_DEPRECATED
+
+/**
+ * gcr_importer_get_parser:
+ * @self: An importer
+ *
+ * Has no effect. Use gcr_importer_listen() instead.
+ *
+ * Returns: %NULL is always returned.
+ * Deprecated: Since 3.0.0
+ */
+GcrParser*
+gcr_importer_get_parser (GcrImporter *self)
+{
+        g_warning ("gcr_importer_get_parser() is no longer supported "
+                   "Use gcr_importer_listen() instead.");
+        return NULL;
+}
+
+/**
+ * gcr_importer_set_parser:
+ * @self: An importer
+ * @parser: A parser
+ *
+ * Has no effect. Use gcr_importer_listen() instead.
+ *
+ * Deprecated: Since 3.0.0
+ */
+void
+gcr_importer_set_parser (GcrImporter *self,
+                         GcrParser *parser)
+{
+        g_warning ("gcr_importer_set_parser() is no longer supported "
+                   "Use gcr_importer_listen() instead.");
+}
+
+/*
+ * gcr_importer_get_slot:
+ * @self: The importer
+ *
+ * Returns %NULL.
+ *
+ * Deprecated: since 3.4.0
+ */
+GckSlot *
+gcr_importer_get_slot (GcrImporter *self)
+{
+        g_warning ("gcr_importer_get_slot() is no longer supported.");
+        return NULL;
+}
+
+/**
+ * gcr_importer_set_slot:
+ * @self: The importer
+ * @slot: The slot to import to
+ *
+ * Has no effect.
+ *
+ * Deprecated: since 3.4.0
+ */
+void
+gcr_importer_set_slot (GcrImporter *self,
+                       GckSlot *slot)
+{
+        g_warning ("gcr_importer_set_slot() is no longer supported.");
+}
+
+/**
+ * gcr_importer_get_prompt_behavior:
+ * @self: The importer
+ *
+ * Returns: zero
+ *
+ * Deprecated: since 3.4.0
+ */
+GcrImporterPromptBehavior
+gcr_importer_get_prompt_behavior (GcrImporter *self)
+{
+	g_warning ("gcr_importer_get_prompt_behavior() is no longer supported.");
+	return 0;
+}
+
+/**
+ * gcr_importer_set_prompt_behavior:
+ * @self: The importer
+ * @behavior: The prompt behavior flag
+ *
+ * Has no effect.
+ *
+ * Deprecated: since 3.4.0
+ */
+void
+gcr_importer_set_prompt_behavior (GcrImporter *self,
+                                  GcrImporterPromptBehavior behavior)
+{
+	g_warning ("gcr_importer_set_prompt_behavior() is no longer supported.");
+}
+
+#endif /* GCR_DISABLE_DEPRECATED */
diff --git a/gcr/gcr-list-selector.c b/gcr/gcr-list-selector.c
index aacde0f..c9cdbca 100644
--- a/gcr/gcr-list-selector.c
+++ b/gcr/gcr-list-selector.c
@@ -358,10 +358,10 @@ gcr_list_selector_class_init (GcrListSelectorClass *klass)
  */
 
 /**
- * gcr_selector_new:
+ * gcr_list_selector_new:
  * @collection: The collection that contains the objects to display
  *
- * Create a new #GcrTreeSelector.
+ * Create a new #GcrListSelector.
  *
  * Returns: A newly allocated selector, which should be released with
  *     g_object_unref().
diff --git a/gcr/gcr-list-selector.h b/gcr/gcr-list-selector.h
index 6d6e748..e109167 100644
--- a/gcr/gcr-list-selector.h
+++ b/gcr/gcr-list-selector.h
@@ -61,8 +61,6 @@ GcrListSelector*         gcr_list_selector_new              (GcrCollection *coll
 
 GcrCollection*           gcr_list_selector_get_collection   (GcrListSelector *self);
 
-const GcrColumn*         gcr_list_selector_get_columns      (GcrListSelector *self);
-
 GList*                   gcr_list_selector_get_selected     (GcrListSelector *self);
 
 void                     gcr_list_selector_set_selected     (GcrListSelector *self,
diff --git a/gcr/gcr-parser.c b/gcr/gcr-parser.c
index 2e7e65f..0483e5b 100644
--- a/gcr/gcr-parser.c
+++ b/gcr/gcr-parser.c
@@ -72,6 +72,12 @@
  */
 
 /**
+ * GcrParsed:
+ *
+ * A parsed item parsed by a #GcrParser.
+ */
+
+/**
  * GcrParserClass:
  * @parent_class: The parent class
  * @authenticate: The default handler for the authenticate signal.
@@ -2374,6 +2380,15 @@ gcr_parser_get_parsed_attributes (GcrParser *self)
 	return gcr_parsed_get_attributes (self->pv->parsed);
 }
 
+/**
+ * gcr_parsed_get_attributes:
+ * @parsed: a parsed item
+ *
+ * Get the attributes which make up the parsed item.
+ *
+ * Returns: The attributes for the item. These are owned by the parsed
+ *          item and should not be freed.
+ */
 GckAttributes *
 gcr_parsed_get_attributes (GcrParsed *parsed)
 {
@@ -2405,6 +2420,14 @@ gcr_parser_get_parsed_label (GcrParser *self)
 	return gcr_parsed_get_label (self->pv->parsed);
 }
 
+/**
+ * gcr_parsed_get_label:
+ * @parsed: a parsed item
+ *
+ * Get the label for the parsed item.
+ *
+ * Returns: the label for the item.
+ */
 const gchar*
 gcr_parsed_get_label (GcrParsed *parsed)
 {
@@ -2439,6 +2462,15 @@ gcr_parser_get_parsed_block (GcrParser *self,
 	return gcr_parsed_get_data (self->pv->parsed, n_block);
 }
 
+/**
+ * gcr_parsed_get_data:
+ * @parsed: a parsed item
+ * @n_data: location to store size of returned data
+ *
+ * Get the raw data block for the parsed item.
+ *
+ * Returns: the raw data of the parsed item, or %NULL
+ */
 gconstpointer
 gcr_parsed_get_data (GcrParsed *parsed,
                      gsize *n_data)
@@ -2466,7 +2498,7 @@ gcr_parsed_get_data (GcrParsed *parsed,
  *
  * This is only valid during the GcrParser::parsed signal.
  *
- * Returns: The data format of the currently parsed item.
+ * Returns: the data format of the currently parsed item
  */
 GcrDataFormat
 gcr_parser_get_parsed_format (GcrParser *self)
@@ -2477,6 +2509,14 @@ gcr_parser_get_parsed_format (GcrParser *self)
 	return gcr_parsed_get_format (self->pv->parsed);
 }
 
+/**
+ * gcr_parsed_get_format:
+ * @parsed: a parsed item
+ *
+ * Get the format of the parsed item.
+ *
+ * Returns: the data format of the item
+ */
 GcrDataFormat
 gcr_parsed_get_format (GcrParsed *parsed)
 {
diff --git a/gcr/gcr-viewer-tool.c b/gcr/gcr-viewer-tool.c
index 85205ca..5ffb2a2 100644
--- a/gcr/gcr-viewer-tool.c
+++ b/gcr/gcr-viewer-tool.c
@@ -61,7 +61,7 @@ on_idle_load_files (gpointer user_data)
 	if (remaining_args) {
 		for (i = 0; remaining_args[i] != NULL; ++i) {
 			file = g_file_new_for_commandline_arg (remaining_args[i]);
-			_gcr_viewer_window_load (window, file);
+			gcr_viewer_window_load (window, file);
 			g_object_unref (file);
 		}
 
@@ -119,7 +119,7 @@ main (int argc, char *argv[])
 
 	gtk_init (&argc, &argv);
 
-	window = _gcr_viewer_window_new ();
+	window = gcr_viewer_window_new ();
 	gtk_widget_show (GTK_WIDGET (window));
 
 	g_idle_add (on_idle_load_files, window);
diff --git a/gcr/gcr-viewer-window.c b/gcr/gcr-viewer-window.c
index e37287b..e2b35ca 100644
--- a/gcr/gcr-viewer-window.c
+++ b/gcr/gcr-viewer-window.c
@@ -36,7 +36,7 @@ struct _GcrViewerWindowPrivate {
 	GcrImportButton *import;
 };
 
-G_DEFINE_TYPE (GcrViewerWindow, _gcr_viewer_window, GTK_TYPE_WINDOW);
+G_DEFINE_TYPE (GcrViewerWindow, gcr_viewer_window, GTK_TYPE_WINDOW);
 
 static void
 on_viewer_renderer_added (GcrViewerWidget *viewer,
@@ -49,7 +49,7 @@ on_viewer_renderer_added (GcrViewerWidget *viewer,
 }
 
 static void
-_gcr_viewer_window_init (GcrViewerWindow *self)
+gcr_viewer_window_init (GcrViewerWindow *self)
 {
 	self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCR_TYPE_VIEWER_WINDOW,
 	                                        GcrViewerWindowPrivate);
@@ -85,7 +85,7 @@ on_close_clicked (GtkButton *button,
 }
 
 static void
-_gcr_viewer_window_constructed (GObject *obj)
+gcr_viewer_window_constructed (GObject *obj)
 {
 	GcrViewerWindow *self = GCR_VIEWER_WINDOW (obj);
 	GtkWidget *bbox;
@@ -93,7 +93,7 @@ _gcr_viewer_window_constructed (GObject *obj)
 	GtkWidget *button;
 	GtkWidget *align;
 
-	G_OBJECT_CLASS (_gcr_viewer_window_parent_class)->constructed (obj);
+	G_OBJECT_CLASS (gcr_viewer_window_parent_class)->constructed (obj);
 
 	bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 	gtk_box_set_spacing (GTK_BOX (bbox), 12);
@@ -138,23 +138,23 @@ _gcr_viewer_window_constructed (GObject *obj)
 }
 
 static void
-_gcr_viewer_window_class_init (GcrViewerWindowClass *klass)
+gcr_viewer_window_class_init (GcrViewerWindowClass *klass)
 {
 	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-	gobject_class->constructed = _gcr_viewer_window_constructed;
+	gobject_class->constructed = gcr_viewer_window_constructed;
 
 	g_type_class_add_private (klass, sizeof (GcrViewerWindow));
 }
 
 GtkWindow *
-_gcr_viewer_window_new (void)
+gcr_viewer_window_new (void)
 {
 	return g_object_new (GCR_TYPE_VIEWER_WINDOW, NULL);
 }
 
 void
-_gcr_viewer_window_load (GcrViewerWindow *self,
+gcr_viewer_window_load (GcrViewerWindow *self,
                          GFile *file)
 {
 	g_return_if_fail (GCR_IS_VIEWER_WINDOW (self));
diff --git a/gcr/gcr-viewer-window.h b/gcr/gcr-viewer-window.h
index 90b0744..4ec2420 100644
--- a/gcr/gcr-viewer-window.h
+++ b/gcr/gcr-viewer-window.h
@@ -26,9 +26,11 @@
 
 #include <gtk/gtk.h>
 
+#ifndef GCR_DISABLE_DEPRECATED
+
 #include "gcr/gcr.h"
 
-#define GCR_TYPE_VIEWER_WINDOW               (_gcr_viewer_window_get_type ())
+#define GCR_TYPE_VIEWER_WINDOW               (gcr_viewer_window_get_type ())
 #define GCR_VIEWER_WINDOW(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GCR_TYPE_VIEWER_WINDOW, GcrViewerWindow))
 #define GCR_VIEWER_WINDOW_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GCR_TYPE_VIEWER_WINDOW, GcrViewerWindowClass))
 #define GCR_IS_VIEWER_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GCR_TYPE_VIEWER_WINDOW))
@@ -50,11 +52,13 @@ struct _GcrViewerWindowClass {
 	GtkWindowClass parent_class;
 };
 
-GType              _gcr_viewer_window_get_type         (void);
+GType              gcr_viewer_window_get_type         (void);
+
+GtkWindow *        gcr_viewer_window_new              (void);
 
-GtkWindow *        _gcr_viewer_window_new              (void);
+void               gcr_viewer_window_load             (GcrViewerWindow *self,
+                                                       GFile *file);
 
-void               _gcr_viewer_window_load             (GcrViewerWindow *self,
-                                                        GFile *file);
+#endif /* GCR_DISABLE_DEPRECATED */
 
 #endif /* GCR_VIEWER_WINDOW_H */
diff --git a/gcr/gcr.symbols b/gcr/gcr.symbols
index d7703de..d9410f3 100644
--- a/gcr/gcr.symbols
+++ b/gcr/gcr.symbols
@@ -42,6 +42,12 @@ gcr_combo_selector_get_selected
 gcr_combo_selector_get_type
 gcr_combo_selector_new
 gcr_combo_selector_set_selected
+gcr_failure_renderer_get_type
+gcr_failure_renderer_new
+gcr_failure_renderer_new_unsupported
+gcr_import_button_add_parsed
+gcr_import_button_get_type
+gcr_import_button_new
 gcr_key_renderer_get_attributes
 gcr_key_renderer_get_type
 gcr_key_renderer_new
@@ -90,3 +96,7 @@ gcr_viewer_remove_renderer
 gcr_viewer_window_get_type
 gcr_viewer_window_load
 gcr_viewer_window_new
+gcr_viewer_widget_get_type
+gcr_viewer_widget_load_data
+gcr_viewer_widget_load_file
+gcr_viewer_widget_new
diff --git a/gcr/tests/frob-unlock.c b/gcr/tests/frob-unlock.c
index ac9c608..b39f218 100644
--- a/gcr/tests/frob-unlock.c
+++ b/gcr/tests/frob-unlock.c
@@ -56,7 +56,7 @@ on_parser_authenticate (GcrParser *parser,
 	GcrUnlockRenderer *renderer;
 	GtkWindow *window;
 
-	window = GTK_WINDOW (_gcr_viewer_window_new ());
+	window = GTK_WINDOW (gcr_viewer_window_new ());
 	g_object_ref_sink (window);
 
 	renderer = _gcr_unlock_renderer_new_for_parsed (parser);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6579f43..03b0896 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -28,6 +28,7 @@ gcr/gcr-gnupg-key.c
 gcr/gcr-gnupg-process.c
 gcr/gcr-gnupg-renderer.c
 gcr/gcr-importer.c
+gcr/gcr-import-button.c
 gcr/gcr-library.c
 gcr/gcr-key-renderer.c
 gcr/gcr-parser.c
@@ -35,6 +36,8 @@ gcr/gcr-trust.c
 [type: gettext/glade]gcr/gcr-unlock-options-widget.ui
 gcr/gcr-unlock-renderer.c
 gcr/gcr-viewer-tool.c
+gcr/gcr-viewer-widget.c
+gcr/gcr-viewer-window.c
 gck/gck-uri.c
 gck/gck-misc.c
 pkcs11/gkm/gkm-certificate.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]