X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkappchooseronlinepk.c;h=20ad1ffd4cdcd661f65b1048973b70c12c0be60c;hb=4bb90a74433d2d38dcf63a2dbc549f549b51c3c3;hp=c49854689090d3733b30205f2658366ebce84f1e;hpb=117e88646f851cd25d5450f078895ae8ece94b47;p=~andy%2Fgtk

diff --git a/gtk/gtkappchooseronlinepk.c b/gtk/gtkappchooseronlinepk.c
index c49854689..20ad1ffd4 100644
--- a/gtk/gtkappchooseronlinepk.c
+++ b/gtk/gtkappchooseronlinepk.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>
  */
@@ -118,12 +116,14 @@ install_mime_types_ready_cb (GObject      *source,
     }
 
   g_simple_async_result_complete (self->priv->result);
+  g_clear_object (&self->priv->result);
 }
 
 static void
 pk_search_mime_async (GtkAppChooserOnline *obj,
                       const gchar         *content_type,
                       GtkWindow           *parent,
+                      GCancellable        *cancellable,
                       GAsyncReadyCallback  callback,
                       gpointer             user_data)
 {
@@ -134,7 +134,7 @@ pk_search_mime_async (GtkAppChooserOnline *obj,
 
   self->priv->result = g_simple_async_result_new (G_OBJECT (self),
                                                   callback, user_data,
-                                                  gtk_app_chooser_online_search_for_mimetype_async);
+                                                  _gtk_app_chooser_online_search_for_mimetype_async);
 
 #ifdef GDK_WINDOWING_X11
   window = gtk_widget_get_window (GTK_WIDGET (parent));
@@ -152,7 +152,7 @@ pk_search_mime_async (GtkAppChooserOnline *obj,
                                     "hide-confirm-search"),
                      G_DBUS_CALL_FLAGS_NONE,
                      G_MAXINT, /* no timeout */
-                     NULL,
+                     cancellable,
                      install_mime_types_ready_cb,
                      self);
 }
@@ -243,7 +243,7 @@ app_chooser_online_pk_init_async (GAsyncInitable *init,
 
   self->priv->init_result = g_simple_async_result_new (G_OBJECT (self),
                                                        callback, user_data,
-                                                       gtk_app_chooser_online_get_default_async);
+                                                       _gtk_app_chooser_online_get_default_async);
 
   self->priv->watch_id =
     g_bus_watch_name (G_BUS_TYPE_SESSION,