* 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>
*/
}
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)
{
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));
- xid = GDK_WINDOW_XID (window);
+ if (GDK_IS_X11_WINDOW (window))
+ xid = GDK_WINDOW_XID (window);
#endif
mime_types[0] = content_type;
"hide-confirm-search"),
G_DBUS_CALL_FLAGS_NONE,
G_MAXINT, /* no timeout */
- NULL,
+ cancellable,
install_mime_types_ready_cb,
self);
}
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,