X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkappchooseronline.c;h=7d72cf72b04522516579977ebd8d96496b4183b2;hb=c6fbdb67f3dc86cf49f2ac5ac8c072f4e586fd29;hp=71267ca7f59b09e559d68baec8adec518bd3fdbe;hpb=51cb082022994634e8639443c9f2463ac4c822e8;p=~andy%2Fgtk

diff --git a/gtk/gtkappchooseronline.c b/gtk/gtkappchooseronline.c
index 71267ca7f..7d72cf72b 100644
--- a/gtk/gtkappchooseronline.c
+++ b/gtk/gtkappchooseronline.c
@@ -14,9 +14,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Cosimo Cecchi <ccecchi@redhat.com>
  */
@@ -30,20 +28,18 @@
 
 #include <gio/gio.h>
 
-#define gtk_app_chooser_online_get_type _gtk_app_chooser_online_get_type
-static void gtk_app_chooser_online_default_init (GtkAppChooserOnlineInterface *iface);
-G_DEFINE_INTERFACE_WITH_CODE (GtkAppChooserOnline, gtk_app_chooser_online, G_TYPE_OBJECT,
+G_DEFINE_INTERFACE_WITH_CODE (GtkAppChooserOnline, _gtk_app_chooser_online, G_TYPE_OBJECT,
                               g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_ASYNC_INITABLE);)
 
 static void
-gtk_app_chooser_online_default_init (GtkAppChooserOnlineInterface *iface)
+_gtk_app_chooser_online_default_init (GtkAppChooserOnlineInterface *iface)
 {
   /* do nothing */
 }
 
 GtkAppChooserOnline *
-gtk_app_chooser_online_get_default_finish (GObject *source,
-                                           GAsyncResult *result)
+_gtk_app_chooser_online_get_default_finish (GObject      *source,
+                                            GAsyncResult *result)
 {
   GtkAppChooserOnline *retval;
 
@@ -51,11 +47,11 @@ gtk_app_chooser_online_get_default_finish (GObject *source,
                                                                 result, NULL));
 
   return retval;
-}  
+}
 
 void
-gtk_app_chooser_online_get_default_async (GAsyncReadyCallback callback,
-                                          gpointer user_data)
+_gtk_app_chooser_online_get_default_async (GAsyncReadyCallback callback,
+                                           gpointer            user_data)
 {
   GIOExtensionPoint *ep;
   GIOExtension *extension;
@@ -76,11 +72,12 @@ gtk_app_chooser_online_get_default_async (GAsyncReadyCallback callback,
 }
 
 void
-gtk_app_chooser_online_search_for_mimetype_async (GtkAppChooserOnline *self,
-                                                  const gchar         *content_type,
-                                                  GtkWindow           *parent,
-                                                  GAsyncReadyCallback  callback,
-                                                  gpointer             user_data)
+_gtk_app_chooser_online_search_for_mimetype_async (GtkAppChooserOnline *self,
+                                                   const gchar         *content_type,
+                                                   GtkWindow           *parent,
+                                                   GCancellable        *cancellable,
+                                                   GAsyncReadyCallback  callback,
+                                                   gpointer             user_data)
 {
   GtkAppChooserOnlineInterface *iface;
 
@@ -88,13 +85,13 @@ gtk_app_chooser_online_search_for_mimetype_async (GtkAppChooserOnline *self,
 
   iface = GTK_APP_CHOOSER_ONLINE_GET_IFACE (self);
 
-  (* iface->search_for_mimetype_async) (self, content_type, parent, callback, user_data);
+  (* iface->search_for_mimetype_async) (self, content_type, parent, cancellable, callback, user_data);
 }
 
 gboolean
-gtk_app_chooser_online_search_for_mimetype_finish (GtkAppChooserOnline  *self,
-                                                   GAsyncResult         *res,
-                                                   GError              **error)
+_gtk_app_chooser_online_search_for_mimetype_finish (GtkAppChooserOnline  *self,
+                                                    GAsyncResult         *res,
+                                                    GError              **error)
 {
   GtkAppChooserOnlineInterface *iface;