app-chooser: other misc doc fixes

diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 63e3c33ace47262ba07daa06c999305d85574ed4..5963787271f2598d8d2dd30599dc5eb99c8013cf 100644 (file)
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -200,7 +200,6 @@
       <xi:include href="xml/gtkfontbutton.xml" />
       <xi:include href="xml/gtkfontsel.xml" />
       <xi:include href="xml/gtkfontseldlg.xml" />
-      <xi:include href="xml/gtkopenwithdialog.xml" />
     </chapter>
     
     <chapter id="LayoutContainers">
@@ -298,6 +297,14 @@
       <xi:include href="xml/gtkrecentfilter.xml" />
     </chapter>
 
+    <chapter id="ApplicationChoosing">
+      <title>Choosing from installed applications</title>
+      <xi:include href="xml/gtkappchooser.xml" />
+      <xi:include href="xml/gtkappchooserbutton.xml" />
+      <xi:include href="xml/gtkappchooserdialog.xml" />
+      <xi:include href="xml/gtkappchooserwidget.xml" />
+    </chapter>
+
     <chapter id="Builder">
       <title>Interface builder</title>
       <xi:include href="xml/gtkbuildable.xml" />

diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index 11da682d8272dfa4564cdaa4b4e520ceef46b731..cb3dc215027d062a2280711fd6b3e41d24e04525 100644 (file)
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -6411,6 +6411,23 @@ GtkSwitchPrivate
 gtk_switch_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtkappchooser</FILE>
+<TITLE>GtkAppChooser</TITLE>
+GtkAppChooser
+gtk_app_chooser_get_app_info
+gtk_app_chooser_get_content_type
+gtk_app_chooser_refresh
+
+<SUBSECTION Standard>
+GTK_TYPE_APP_CHOOSER
+GTK_APP_CHOOSER
+GTK_IS_APP_CHOOSER
+
+<SUBSECTION Private>
+gtk_app_chooser_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkappchooserbutton</FILE>
 <TITLE>GtkAppChooserButton</TITLE>

diff --git a/docs/reference/gtk/gtk3.types b/docs/reference/gtk/gtk3.types
index 88071c9cd8df40462990a96ef7d9bbd28bbf3f4c..6b43eccf7f2d98e847bc8dea1f7ddffa431b1516 100644 (file)
--- a/docs/reference/gtk/gtk3.types
+++ b/docs/reference/gtk/gtk3.types
@@ -11,6 +11,10 @@ gtk_action_group_get_type
 gtk_activatable_get_type
 gtk_adjustment_get_type
 gtk_alignment_get_type
+gtk_app_chooser_get_type
+gtk_app_chooser_button_get_type
+gtk_app_chooser_dialog_get_type
+gtk_app_chooser_widget_get_type
 gtk_application_get_type
 gtk_arrow_get_type
 gtk_aspect_frame_get_type
@@ -94,7 +98,6 @@ gtk_misc_get_type
 gtk_mount_operation_get_type
 gtk_notebook_get_type
 gtk_offscreen_window_get_type
-gtk_open_with_dialog_get_type
 gtk_orientable_get_type
 gtk_page_setup_get_type
 gtk_page_setup_unix_dialog_get_type

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 6ca513652ef70045e568483587dfe73bf723749d..a950ae1f9972e1407530029991cde9002c22a5cc 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -178,6 +178,10 @@ gtk_alignment_new
 gtk_alignment_set
 gtk_alignment_set_padding
 gtk_alternative_dialog_button_order
+gtk_app_chooser_get_app_info
+gtk_app_chooser_get_content_type
+gtk_app_chooser_get_type G_GNUC_CONST
+gtk_app_chooser_refresh
 gtk_app_chooser_button_append_custom_item
 gtk_app_chooser_button_append_separator
 gtk_app_chooser_button_get_show_dialog_item

diff --git a/gtk/gtkappchooserbutton.c b/gtk/gtkappchooserbutton.c
index d95d435deeb2909764d14fa8684b8da8947c24e1..639520cbf5e12fd7c00ced56ac23ef1c17024447 100644 (file)
--- a/gtk/gtkappchooserbutton.c
+++ b/gtk/gtkappchooserbutton.c
@@ -512,7 +512,7 @@ gtk_app_chooser_button_class_init (GtkAppChooserButtonClass *klass)
   /**
    * GtkAppChooserButton:show-dialog-item:
    *
-   * The ::show-dialog-item property determines whether the dropdown menu
+   * The #GtkAppChooserButton:show-dialog-item property determines whether the dropdown menu
    * should show an item that triggers a #GtkAppChooserDialog when clicked.
    */
   pspec =
@@ -689,7 +689,7 @@ gtk_app_chooser_button_get_show_dialog_item (GtkAppChooserButton *self)
 }
 
 /**
- * gtk_app_chooser_button_get_show_dialog_item:
+ * gtk_app_chooser_button_set_show_dialog_item:
  * @self: a #GtkAppChooserButton
  * @setting: the new value for #GtkAppChooserButton:show-dialog-item
  *

diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c
index 1c453ab50e96babac7eeaed5aa0527541f60c63c..83cf7e00e444703927fb498bc6c16b34641d304e 100644 (file)
--- a/gtk/gtkappchooserdialog.c
+++ b/gtk/gtkappchooserdialog.c
@@ -774,7 +774,7 @@ gtk_app_chooser_dialog_new_for_content_type (GtkWindow      *parent,
  *
  * Returns the #GtkAppChooserWidget of this dialog.
  *
- * Returns: the #GtkAppChooserWidget of @self
+ * Returns: (transfer none): the #GtkAppChooserWidget of @self
  *
  * Since: 3.0
  */

diff --git a/gtk/gtkappchooserwidget.c b/gtk/gtkappchooserwidget.c
index b73638c1877e5b1f7eb7e59ee369fa2a5d6aff43..95510e9a35fa7e5fa43bbb3160ff7f7a8552d716 100644 (file)
--- a/gtk/gtkappchooserwidget.c
+++ b/gtk/gtkappchooserwidget.c
@@ -1010,7 +1010,7 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass)
   /**
    * GtkAppChooserWidget:show-recommended:
    *
-   * The ::show-recommended property determines whether the app chooser
+   * The #GtkAppChooserWidget:show-recommended property determines whether the app chooser
    * should show a section for recommended applications. If %FALSE, the
    * recommended applications are listed among the other applications.
    */
@@ -1024,7 +1024,7 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass)
   /**
    * GtkAppChooserWidget:show-fallback:
    *
-   * The ::show-fallback property determines whether the app chooser
+   * The #GtkAppChooserWidget:show-fallback property determines whether the app chooser
    * should show a section for related applications. If %FALSE, the
    * related applications are listed among the other applications.
    */
@@ -1038,7 +1038,7 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass)
   /**
    * GtkAppChooserWidget:show-other:
    *
-   * The ::show-other property determines whether the app chooser
+   * The #GtkAppChooserWidget:show-other property determines whether the app chooser
    * should show a section for other applications.
    */
   pspec = g_param_spec_boolean ("show-other",
@@ -1051,7 +1051,7 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass)
   /**
    * GtkAppChooserWidget:show-all:
    *
-   * If the ::show-all property is %TRUE, the app chooser presents
+   * If the #GtkAppChooserWidget:show-all property is %TRUE, the app chooser presents
    * all applications in a single list, without subsections for
    * default, recommended or related applications.
    */
@@ -1062,6 +1062,13 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass)
                                 G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (gobject_class, PROP_SHOW_ALL, pspec);
 
+  /**
+   * GtkAppChooserWidget:default-text:
+   *
+   * The #GtkAppChooserWidget:default-text property determines the text that appears
+   * in the widget when there are no applications for the given content type.
+   * See also gtk_app_chooser_widget_set_default_text().
+   */
   pspec = g_param_spec_string ("default-text",
                                P_("Widget's default text"),
                                P_("The default text appearing when there are no applications"),

diff --git a/gtk/gtkappchooserwidget.h b/gtk/gtkappchooserwidget.h
index 22b60f796bfedcb9da69917c8b12811f798fc479..e12541762c1ab69e7f7da6dcc2fd31635dce949e 100644 (file)
--- a/gtk/gtkappchooserwidget.h
+++ b/gtk/gtkappchooserwidget.h
@@ -91,7 +91,7 @@ void          gtk_app_chooser_widget_set_show_other       (GtkAppChooserWidget *
 gboolean      gtk_app_chooser_widget_get_show_other       (GtkAppChooserWidget *self);
 
 void          gtk_app_chooser_widget_set_show_all         (GtkAppChooserWidget *self,
-                                                           gboolean             show_all);
+                                                           gboolean             setting);
 gboolean      gtk_app_chooser_widget_get_show_all         (GtkAppChooserWidget *self);
 
 void          gtk_app_chooser_widget_set_default_text     (GtkAppChooserWidget *self,

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 71354056e8bf2a4cef4f4b8727a7f1d531701ea5..4d63c1106551fe414555029c13de92f60dbb7cb5 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -31,6 +31,8 @@ noinst_PROGRAMS =  $(TEST_PROGS)      \
        print-editor                    \
        testaccel                       \
        testadjustsize                  \
+       testappchooser                  \
+       testappchooserbutton            \
        testassistant                   \
        testbbox                        \
        testbuttons                     \
@@ -66,8 +68,6 @@ noinst_PROGRAMS =  $(TEST_PROGS)      \
        testoffscreen                   \
        testoffscreenwindow             \
        testorientable                  \
-       testappchooser                  \
-       testappchooserbutton            \
        testprint                       \
        testrecentchooser               \
        testrecentchoosermenu           \