r16614 - in /desktop/unstable/eel2/debian: changelog patches/10_open-with_install.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue Jul 22 10:39:41 UTC 2008
Author: joss
Date: Tue Jul 22 10:39:41 2008
New Revision: 16614
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16614
Log:
10_open-with_install.patch: backport fix from experimental. Handle
the case where mime_type = NULL. See bugzilla #541183.
Modified:
desktop/unstable/eel2/debian/changelog
desktop/unstable/eel2/debian/patches/10_open-with_install.patch
Modified: desktop/unstable/eel2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eel2/debian/changelog?rev=16614&op=diff
==============================================================================
--- desktop/unstable/eel2/debian/changelog (original)
+++ desktop/unstable/eel2/debian/changelog Tue Jul 22 10:39:41 2008
@@ -1,3 +1,10 @@
+eel2 (2.20.0-7) unstable; urgency=low
+
+ * 10_open-with_install.patch: backport fix from experimental. Handle
+ the case where mime_type = NULL. See bugzilla #541183.
+
+ -- Josselin Mouette <joss at debian.org> Tue, 22 Jul 2008 12:39:09 +0200
+
eel2 (2.20.0-6) unstable; urgency=low
* 03_glib-2.16-ftbfs.patch: make the patch apply with -p1 instead of
Modified: desktop/unstable/eel2/debian/patches/10_open-with_install.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eel2/debian/patches/10_open-with_install.patch?rev=16614&op=diff
==============================================================================
--- desktop/unstable/eel2/debian/patches/10_open-with_install.patch (original)
+++ desktop/unstable/eel2/debian/patches/10_open-with_install.patch Tue Jul 22 10:39:41 2008
@@ -1,7 +1,7 @@
Index: eel-2.20.0/eel/eel-open-with-dialog.c
===================================================================
--- eel-2.20.0.orig/eel/eel-open-with-dialog.c 2007-08-21 15:16:49.000000000 +0200
-+++ eel-2.20.0/eel/eel-open-with-dialog.c 2007-11-18 17:32:57.950024703 +0100
++++ eel-2.20.0/eel/eel-open-with-dialog.c 2008-07-22 12:37:02.600313798 +0200
@@ -30,6 +30,7 @@
#include "eel-stock-dialogs.h"
@@ -33,7 +33,7 @@
struct _EelOpenWithDialogDetails {
char *uri;
-@@ -67,11 +77,14 @@ struct _EelOpenWithDialogDetails {
+@@ -67,11 +77,14 @@
char *new_glob;
char *desktop_file;
@@ -48,7 +48,7 @@
GtkWidget *open_label;
-@@ -80,6 +93,11 @@ struct _EelOpenWithDialogDetails {
+@@ -80,6 +93,11 @@
GSList *add_icon_paths;
gint add_items_idle_id;
gint add_icons_idle_id;
@@ -60,7 +60,7 @@
};
enum {
-@@ -92,6 +110,8 @@ enum {
+@@ -92,6 +110,8 @@
NUM_COLUMNS
};
@@ -69,7 +69,7 @@
enum {
RESPONSE_OPEN
};
-@@ -119,6 +139,10 @@ eel_open_with_dialog_finalize (GObject *
+@@ -119,6 +139,10 @@
g_source_remove (dialog->details->add_items_idle_id);
}
@@ -80,7 +80,7 @@
g_free (dialog->details->uri);
g_free (dialog->details->mime_type);
g_free (dialog->details->mime_description);
-@@ -129,6 +153,15 @@ eel_open_with_dialog_finalize (GObject *
+@@ -129,6 +153,15 @@
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@@ -96,7 +96,7 @@
static void
eel_open_with_dialog_destroy (GtkObject *object)
{
-@@ -293,6 +326,56 @@ add_or_find_application (EelOpenWithDial
+@@ -293,6 +326,56 @@
}
static void
@@ -153,7 +153,7 @@
emit_application_selected (EelOpenWithDialog *dialog,
GnomeVFSMimeApplication *application)
{
-@@ -309,7 +392,10 @@ response_cb (EelOpenWithDialog *dialog,
+@@ -309,7 +392,10 @@
switch (response_id) {
case RESPONSE_OPEN:
@@ -165,7 +165,7 @@
application = add_or_find_application (dialog);
if (application) {
-@@ -444,28 +530,39 @@ eel_open_with_dialog_add_icon_idle (EelO
+@@ -444,28 +530,39 @@
GdkPixbuf *pixbuf;
char *file;
gboolean long_operation;
@@ -213,7 +213,7 @@
COLUMN_ICON_FILE, &file, -1);
if (file == NULL) {
-@@ -476,24 +573,47 @@ eel_open_with_dialog_add_icon_idle (EelO
+@@ -476,24 +573,47 @@
pixbuf = gdk_pixbuf_new_from_file_at_size (file, 24, 24, NULL);
long_operation = TRUE;
} else {
@@ -276,7 +276,7 @@
g_object_unref (pixbuf);
}
g_free (file);
-@@ -661,7 +781,23 @@ eel_open_with_search_equal_func (GtkTree
+@@ -661,7 +781,23 @@
}
}
@@ -301,7 +301,7 @@
static gboolean
eel_open_with_dialog_add_items_idle (EelOpenWithDialog *dialog)
-@@ -748,6 +884,121 @@ eel_open_with_dialog_add_items_idle (Eel
+@@ -748,6 +884,126 @@
}
@@ -312,6 +312,11 @@
+ const gchar *filename;
+ GtkCellRenderer *renderer;
+ GtkTreeViewColumn *column;
++
++ if (dialog->details->mime_type == NULL) {
++ /* Nothing to show anyway */
++ return FALSE;
++ }
+
+ /* create list store */
+ dialog->details->avail_program_list_store = gtk_list_store_new (NUM_COLUMNS,
@@ -423,7 +428,7 @@
static char *
remove_parameters (const char *exec)
{
-@@ -802,6 +1053,14 @@ program_list_selection_changed (GtkTreeS
+@@ -802,6 +1058,14 @@
return;
}
@@ -438,7 +443,7 @@
path = NULL;
gtk_tree_model_get (model, &iter,
COLUMN_PATH, &path,
-@@ -851,9 +1110,14 @@ program_list_selection_activated (GtkTre
+@@ -851,9 +1115,14 @@
EelOpenWithDialog *dialog)
{
GtkTreeSelection *selection;
@@ -454,7 +459,7 @@
program_list_selection_changed (selection, dialog);
gtk_dialog_response (GTK_DIALOG (&dialog->parent), RESPONSE_OPEN);
-@@ -876,16 +1140,47 @@ expander_toggled (GtkWidget *expander, E
+@@ -876,16 +1145,47 @@
}
static void
@@ -503,7 +508,7 @@
dialog->details = g_new0 (EelOpenWithDialogDetails, 1);
-@@ -897,19 +1192,23 @@ eel_open_with_dialog_instance_init (EelO
+@@ -897,19 +1197,23 @@
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
@@ -533,7 +538,7 @@
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_size_request (scrolled_window, 400, 300);
-@@ -943,14 +1242,11 @@ eel_open_with_dialog_instance_init (EelO
+@@ -943,14 +1247,11 @@
dialog);
dialog->details->add_items_idle_id = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
@@ -550,7 +555,7 @@
expander = gtk_expander_new_with_mnemonic (_("_Use a custom command"));
gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE, 0);
g_signal_connect_after (expander, "activate", G_CALLBACK (expander_toggled), dialog);
-@@ -973,6 +1269,60 @@ eel_open_with_dialog_instance_init (EelO
+@@ -973,6 +1274,60 @@
G_CALLBACK (browse_clicked_cb), dialog);
gtk_box_pack_start (GTK_BOX (hbox), dialog->details->button, FALSE, FALSE, 0);
gtk_widget_show (dialog->details->button);
@@ -611,7 +616,7 @@
gtk_dialog_add_button (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL,
-@@ -990,12 +1340,12 @@ eel_open_with_dialog_instance_init (EelO
+@@ -990,12 +1345,12 @@
hbox = gtk_hbox_new (FALSE, 2);
gtk_widget_show (hbox);
More information about the pkg-gnome-commits
mailing list