r16428 - in /desktop/experimental/nautilus/debian: changelog patches/20_open-with_install.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed Jul 2 09:51:27 UTC 2008
Author: joss
Date: Wed Jul 2 09:51:27 2008
New Revision: 16428
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16428
Log:
20_open-with_install.patch: handle the case where content_type =
NULL. See bugzilla #541183.
Modified:
desktop/experimental/nautilus/debian/changelog
desktop/experimental/nautilus/debian/patches/20_open-with_install.patch
Modified: desktop/experimental/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/changelog?rev=16428&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog (original)
+++ desktop/experimental/nautilus/debian/changelog Wed Jul 2 09:51:27 2008
@@ -1,3 +1,10 @@
+nautilus (2.22.4-2) UNRELEASED; urgency=low
+
+ * 20_open-with_install.patch: handle the case where content_type =
+ NULL. See bugzilla #541183.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 02 Jul 2008 11:50:38 +0200
+
nautilus (2.22.4-1) experimental; urgency=low
* New upstream bugfix release.
Modified: desktop/experimental/nautilus/debian/patches/20_open-with_install.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/20_open-with_install.patch?rev=16428&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/20_open-with_install.patch (original)
+++ desktop/experimental/nautilus/debian/patches/20_open-with_install.patch Wed Jul 2 09:51:27 2008
@@ -1,7 +1,7 @@
-Index: nautilus-2.22.2/libnautilus-private/nautilus-open-with-dialog.c
+Index: nautilus-2.22.4/libnautilus-private/nautilus-open-with-dialog.c
===================================================================
---- nautilus-2.22.2.orig/libnautilus-private/nautilus-open-with-dialog.c 2008-05-24 14:54:52.885896086 +0200
-+++ nautilus-2.22.2/libnautilus-private/nautilus-open-with-dialog.c 2008-05-24 19:17:19.513891978 +0200
+--- nautilus-2.22.4.orig/libnautilus-private/nautilus-open-with-dialog.c 2008-03-29 10:40:43.000000000 +0100
++++ nautilus-2.22.4/libnautilus-private/nautilus-open-with-dialog.c 2008-07-02 11:37:38.791094374 +0200
@@ -32,6 +32,7 @@
#include <eel/eel-stock-dialogs.h>
@@ -49,7 +49,7 @@
GtkWidget *open_label;
-@@ -76,6 +90,11 @@ struct _NautilusOpenWithDialogDetails {
+@@ -76,6 +90,11 @@
GSList *add_icon_paths;
gint add_items_idle_id;
gint add_icons_idle_id;
@@ -61,7 +61,7 @@
};
enum {
-@@ -88,6 +107,9 @@ enum {
+@@ -88,6 +107,9 @@
NUM_COLUMNS
};
@@ -71,7 +71,7 @@
enum {
RESPONSE_OPEN
};
-@@ -115,6 +137,10 @@ nautilus_open_with_dialog_finalize (GObj
+@@ -115,6 +137,10 @@
g_source_remove (dialog->details->add_items_idle_id);
}
@@ -82,7 +82,7 @@
if (dialog->details->selected_app_info) {
g_object_unref (dialog->details->selected_app_info);
}
-@@ -127,6 +153,15 @@ nautilus_open_with_dialog_finalize (GObj
+@@ -127,6 +153,15 @@
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@@ -98,7 +98,7 @@
static void
nautilus_open_with_dialog_destroy (GtkObject *object)
{
-@@ -283,6 +318,56 @@ add_or_find_application (NautilusOpenWit
+@@ -283,6 +318,56 @@
}
static void
@@ -155,7 +155,7 @@
emit_application_selected (NautilusOpenWithDialog *dialog,
GAppInfo *application)
{
-@@ -299,7 +384,10 @@ response_cb (NautilusOpenWithDialog *dia
+@@ -299,7 +384,10 @@
switch (response_id) {
case RESPONSE_OPEN:
@@ -167,7 +167,7 @@
application = add_or_find_application (dialog);
if (application) {
-@@ -428,9 +516,9 @@ entry_changed_cb (GtkWidget *entry,
+@@ -428,9 +516,9 @@
}
static GdkPixbuf *
@@ -179,7 +179,7 @@
char *filename;
pixbuf = NULL;
-@@ -441,24 +529,43 @@ get_pixbuf_for_icon (GIcon *icon)
+@@ -441,24 +529,43 @@
}
g_free (filename);
} else if (G_IS_THEMED_ICON (icon)) {
@@ -237,7 +237,7 @@
}
}
return pixbuf;
-@@ -472,20 +579,32 @@ nautilus_open_with_dialog_add_icon_idle
+@@ -472,20 +579,32 @@
GdkPixbuf *pixbuf;
GIcon *icon;
gboolean long_operation;
@@ -276,7 +276,7 @@
&iter, path)) {
gtk_tree_path_free (path);
continue;
-@@ -493,17 +612,17 @@ nautilus_open_with_dialog_add_icon_idle
+@@ -493,17 +612,17 @@
gtk_tree_path_free (path);
@@ -297,7 +297,7 @@
g_object_unref (pixbuf);
}
-@@ -579,6 +698,23 @@ nautilus_open_with_search_equal_func (Gt
+@@ -579,6 +698,23 @@
}
}
@@ -321,7 +321,7 @@
static gboolean
-@@ -661,39 +797,165 @@ nautilus_open_with_dialog_add_items_idle
+@@ -661,39 +797,170 @@
return FALSE;
}
@@ -332,6 +332,11 @@
+ GtkTreeViewColumn *column;
+ GDir *dir;
+ const gchar *filename;
++
++ if (dialog->details->content_type == NULL) {
++ /* Nothing to show anyway */
++ return FALSE;
++ }
+
+ /* create list store */
+ dialog->details->avail_program_list_store = gtk_list_store_new (NUM_COLUMNS,
@@ -505,7 +510,7 @@
}
static void
-@@ -703,9 +965,15 @@ program_list_selection_activated (GtkTre
+@@ -703,9 +970,15 @@
NautilusOpenWithDialog *dialog)
{
GtkTreeSelection *selection;
@@ -522,7 +527,7 @@
program_list_selection_changed (selection, dialog);
gtk_dialog_response (GTK_DIALOG (&dialog->parent), RESPONSE_OPEN);
-@@ -727,16 +995,48 @@ expander_toggled (GtkWidget *expander, N
+@@ -727,16 +1000,48 @@
}
static void
@@ -572,7 +577,7 @@
dialog->details = g_new0 (NautilusOpenWithDialogDetails, 1);
-@@ -748,6 +1048,8 @@ nautilus_open_with_dialog_instance_init
+@@ -748,6 +1053,8 @@
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
@@ -581,7 +586,7 @@
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-@@ -757,10 +1059,12 @@ nautilus_open_with_dialog_instance_init
+@@ -757,10 +1064,12 @@
dialog->details->label = gtk_label_new ("");
gtk_misc_set_alignment (GTK_MISC (dialog->details->label), 0.0, 0.5);
gtk_label_set_line_wrap (GTK_LABEL (dialog->details->label), TRUE);
@@ -595,7 +600,7 @@
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_size_request (scrolled_window, 400, 300);
-@@ -797,8 +1101,6 @@ nautilus_open_with_dialog_instance_init
+@@ -797,8 +1106,6 @@
(GSourceFunc) nautilus_open_with_dialog_add_items_idle,
dialog, NULL);
@@ -604,7 +609,7 @@
gtk_widget_show_all (vbox);
-@@ -825,6 +1127,60 @@ nautilus_open_with_dialog_instance_init
+@@ -825,6 +1132,60 @@
gtk_box_pack_start (GTK_BOX (hbox), dialog->details->button, FALSE, FALSE, 0);
gtk_widget_show (dialog->details->button);
@@ -665,7 +670,7 @@
gtk_dialog_add_button (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL);
-@@ -841,12 +1197,12 @@ nautilus_open_with_dialog_instance_init
+@@ -841,12 +1202,12 @@
hbox = gtk_hbox_new (FALSE, 2);
gtk_widget_show (hbox);
@@ -683,7 +688,7 @@
align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_widget_show (align);
-@@ -854,7 +1210,6 @@ nautilus_open_with_dialog_instance_init
+@@ -854,7 +1215,6 @@
gtk_widget_show (dialog->details->button);
GTK_WIDGET_SET_FLAGS (dialog->details->button, GTK_CAN_DEFAULT);
More information about the pkg-gnome-commits
mailing list