X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkappchooserdialog.c;h=00882d558423eaa6be5a4ff175e1fd7dc910b40b;hb=bda5987335b8c7828ebf1d289a91accfe2e74dbe;hp=0143a16c13adeee7efdaccc3e9a0373fd6c2e640;hpb=ca0c7c16499860c344a0e00c6749525d25e374ac;p=~andy%2Fgtk
diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c
index 0143a16c1..00882d558 100644
--- a/gtk/gtkappchooserdialog.c
+++ b/gtk/gtkappchooserdialog.c
@@ -15,9 +15,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 .
*
* Authors: Dave Camp
* Alexander Larsson
@@ -35,6 +33,9 @@
* of its own. Instead, you should get the embedded #GtkAppChooserWidget
* using gtk_app_chooser_dialog_get_widget() and call its methods if
* the generic #GtkAppChooser interface is not sufficient for your needs.
+ *
+ * To set the heading that is shown above the #GtkAppChooserWidget,
+ * use gtk_app_chooser_dialog_set_heading().
*/
#include "config.h"
@@ -74,8 +75,10 @@ struct _GtkAppChooserDialogPrivate {
GtkWidget *show_more_button;
GtkAppChooserOnline *online;
+ GCancellable *online_cancellable;
gboolean show_more_clicked;
+ gboolean dismissed;
};
enum {
@@ -125,17 +128,26 @@ search_for_mimetype_ready_cb (GObject *source,
_gtk_app_chooser_online_search_for_mimetype_finish (online, res, &error);
- if (error != NULL)
+ if (self->priv->dismissed)
+ goto out;
+
+ if (error != NULL &&
+ !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
{
show_error_dialog (_("Failed to look for applications online"),
error->message, GTK_WINDOW (self));
- g_error_free (error);
}
else
{
+ gtk_widget_set_sensitive (self->priv->online_button, TRUE);
gtk_app_chooser_refresh (GTK_APP_CHOOSER (self->priv->app_chooser_widget));
}
+ out:
+ g_clear_object (&self->priv->online_cancellable);
+ g_clear_error (&error);
+ g_object_unref (self);
+
gdk_threads_leave ();
}
@@ -145,11 +157,15 @@ online_button_clicked_cb (GtkButton *b,
{
GtkAppChooserDialog *self = user_data;
+ self->priv->online_cancellable = g_cancellable_new ();
+ gtk_widget_set_sensitive (self->priv->online_button, FALSE);
+
_gtk_app_chooser_online_search_for_mimetype_async (self->priv->online,
self->priv->content_type,
GTK_WINDOW (self),
+ self->priv->online_cancellable,
search_for_mimetype_ready_cb,
- self);
+ g_object_ref (self));
}
static void
@@ -163,12 +179,13 @@ app_chooser_online_get_default_ready_cb (GObject *source,
self->priv->online = _gtk_app_chooser_online_get_default_finish (source, res);
- if (self->priv->online != NULL)
+ if (self->priv->online != NULL &&
+ !self->priv->dismissed)
{
GtkWidget *action_area;
action_area = gtk_dialog_get_action_area (GTK_DIALOG (self));
- self->priv->online_button = gtk_button_new_with_label (_("Find applications online"));
+ self->priv->online_button = gtk_button_new_with_mnemonic (_("_Find applications online"));
gtk_box_pack_start (GTK_BOX (action_area), self->priv->online_button,
FALSE, FALSE, 0);
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (action_area), self->priv->online_button,
@@ -183,72 +200,16 @@ app_chooser_online_get_default_ready_cb (GObject *source,
gtk_widget_show (self->priv->online_button);
}
+ g_object_unref (self);
+
gdk_threads_leave ();
}
static void
ensure_online_button (GtkAppChooserDialog *self)
{
- _gtk_app_chooser_online_get_default_async (app_chooser_online_get_default_ready_cb, self);
-}
-
-/* An application is valid if:
- *
- * 1) The file exists
- * 2) The user has permissions to run the file
- */
-static gboolean
-check_application (GtkAppChooserDialog *self,
- GAppInfo **app_out)
-{
- const char *command;
- char *path = NULL;
- char **argv = NULL;
- int argc;
- GError *error = NULL;
- gint retval = TRUE;
- GAppInfo *info;
-
- command = NULL;
-
- info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (self->priv->app_chooser_widget));
- command = g_app_info_get_executable (info);
-
- g_shell_parse_argv (command, &argc, &argv, &error);
-
- if (error)
- {
- show_error_dialog (_("Could not run application"),
- error->message,
- GTK_WINDOW (self));
- g_error_free (error);
- retval = FALSE;
- goto cleanup;
- }
-
- path = g_find_program_in_path (argv[0]);
- if (!path)
- {
- char *error_message;
-
- error_message = g_strdup_printf (_("Could not find '%s'"),
- argv[0]);
-
- show_error_dialog (_("Could not find application"),
- error_message,
- GTK_WINDOW (self));
- g_free (error_message);
- retval = FALSE;
- goto cleanup;
- }
-
- *app_out = info;
-
- cleanup:
- g_strfreev (argv);
- g_free (path);
-
- return retval;
+ _gtk_app_chooser_online_get_default_async (app_chooser_online_get_default_ready_cb,
+ g_object_ref (self));
}
static void
@@ -258,13 +219,25 @@ add_or_find_application (GtkAppChooserDialog *self)
app = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (self));
- /* we don't care about reporting errors here */
- if (self->priv->content_type)
- g_app_info_set_as_last_used_for_type (app,
- self->priv->content_type,
- NULL);
+ if (app)
+ {
+ /* we don't care about reporting errors here */
+ if (self->priv->content_type)
+ g_app_info_set_as_last_used_for_type (app,
+ self->priv->content_type,
+ NULL);
+ g_object_unref (app);
+ }
+}
- g_object_unref (app);
+static void
+cancel_and_clear_cancellable (GtkAppChooserDialog *self)
+{
+ if (self->priv->online_cancellable != NULL)
+ {
+ g_cancellable_cancel (self->priv->online_cancellable);
+ g_clear_object (&self->priv->online_cancellable);
+ }
}
static void
@@ -279,6 +252,10 @@ gtk_app_chooser_dialog_response (GtkDialog *dialog,
case GTK_RESPONSE_OK:
add_or_find_application (self);
break;
+ case GTK_RESPONSE_CANCEL:
+ case GTK_RESPONSE_DELETE_EVENT:
+ cancel_and_clear_cancellable (self);
+ self->priv->dismissed = TRUE;
default :
break;
}
@@ -478,6 +455,7 @@ build_dialog_ui (GtkAppChooserDialog *self)
GtkWidget *vbox;
GtkWidget *vbox2;
GtkWidget *button, *w;
+ GAppInfo *info;
gtk_container_set_border_width (GTK_CONTAINER (self), 5);
@@ -491,7 +469,8 @@ build_dialog_ui (GtkAppChooserDialog *self)
gtk_widget_show (vbox2);
self->priv->label = gtk_label_new ("");
- gtk_misc_set_alignment (GTK_MISC (self->priv->label), 0, 0.5);
+ gtk_widget_set_halign (self->priv->label, GTK_ALIGN_START);
+ gtk_widget_set_valign (self->priv->label, GTK_ALIGN_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (self->priv->label), TRUE);
gtk_box_pack_start (GTK_BOX (vbox2), self->priv->label,
FALSE, FALSE, 0);
@@ -530,6 +509,11 @@ build_dialog_ui (GtkAppChooserDialog *self)
_("_Select"),
GTK_RESPONSE_OK);
+ info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (self->priv->app_chooser_widget));
+ gtk_widget_set_sensitive (self->priv->button, info != NULL);
+ if (info)
+ g_object_unref (info);
+
gtk_dialog_set_default_response (GTK_DIALOG (self),
GTK_RESPONSE_OK);
}
@@ -557,12 +541,7 @@ static GAppInfo *
gtk_app_chooser_dialog_get_app_info (GtkAppChooser *object)
{
GtkAppChooserDialog *self = GTK_APP_CHOOSER_DIALOG (object);
- GAppInfo *app = NULL;
-
- if (!check_application (self, &app))
- return NULL;
-
- return app;
+ return gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (self->priv->app_chooser_widget));
}
static void
@@ -592,6 +571,7 @@ gtk_app_chooser_dialog_dispose (GObject *object)
GtkAppChooserDialog *self = GTK_APP_CHOOSER_DIALOG (object);
g_clear_object (&self->priv->gfile);
+ cancel_and_clear_cancellable (self);
g_clear_object (&self->priv->online);
G_OBJECT_CLASS (gtk_app_chooser_dialog_parent_class)->dispose (object);