r18196 - in /desktop/experimental/nautilus/debian: changelog patches/20_open-with_install.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue Jan 6 16:06:09 UTC 2009
Author: joss
Date: Tue Jan 6 16:06:09 2009
New Revision: 18196
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18196
Log:
20_open-with_install.patch: add missing argument to
gtk_tree_model_get. Closes: #510694.
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=18196&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog (original)
+++ desktop/experimental/nautilus/debian/changelog Tue Jan 6 16:06:09 2009
@@ -1,9 +1,11 @@
-nautilus (2.24.2-2) UNRELEASED; urgency=low
+nautilus (2.24.2-2) experimental; urgency=low
* Add a Breaks with g-v-m << 2.24 to avoid double actions on device
insertion. Closes: #507630, #510692.
-
- -- Josselin Mouette <joss at debian.org> Sat, 13 Dec 2008 16:58:25 +0100
+ * 20_open-with_install.patch: add missing argument to
+ gtk_tree_model_get. Closes: #510694.
+
+ -- Josselin Mouette <joss at debian.org> Tue, 06 Jan 2009 17:07:39 +0100
nautilus (2.24.2-1) experimental; urgency=low
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=18196&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/20_open-with_install.patch (original)
+++ desktop/experimental/nautilus/debian/patches/20_open-with_install.patch Tue Jan 6 16:06:09 2009
@@ -1,5 +1,7 @@
---- nautilus.old/libnautilus-private/nautilus-open-with-dialog.c.orig 2008-07-07 14:31:14.000000000 -0300
-+++ nautilus/libnautilus-private/nautilus-open-with-dialog.c 2008-09-23 09:01:53.000000000 -0300
+Index: nautilus-2.24.2/libnautilus-private/nautilus-open-with-dialog.c
+===================================================================
+--- nautilus-2.24.2.orig/libnautilus-private/nautilus-open-with-dialog.c 2008-10-13 12:04:26.000000000 +0200
++++ nautilus-2.24.2/libnautilus-private/nautilus-open-with-dialog.c 2009-01-06 17:06:35.568191628 +0100
@@ -32,6 +32,7 @@
#include <eel/eel-stock-dialogs.h>
@@ -39,7 +41,7 @@
GtkWidget *open_label;
-@@ -59,6 +72,11 @@
+@@ -59,6 +72,11 @@ struct _NautilusOpenWithDialogDetails {
GSList *add_icon_paths;
gint add_items_idle_id;
gint add_icons_idle_id;
@@ -51,7 +53,7 @@
};
enum {
-@@ -71,6 +89,9 @@
+@@ -71,6 +89,9 @@ enum {
NUM_COLUMNS
};
@@ -61,7 +63,7 @@
enum {
RESPONSE_OPEN
};
-@@ -98,6 +119,10 @@
+@@ -98,6 +119,10 @@ nautilus_open_with_dialog_finalize (GObj
g_source_remove (dialog->details->add_items_idle_id);
}
@@ -72,7 +74,7 @@
if (dialog->details->selected_app_info) {
g_object_unref (dialog->details->selected_app_info);
}
-@@ -110,6 +135,15 @@
+@@ -110,6 +135,15 @@ nautilus_open_with_dialog_finalize (GObj
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@@ -88,7 +90,7 @@
static void
nautilus_open_with_dialog_destroy (GtkObject *object)
{
-@@ -267,6 +301,56 @@
+@@ -267,6 +301,56 @@ add_or_find_application (NautilusOpenWit
}
static void
@@ -145,7 +147,7 @@
emit_application_selected (NautilusOpenWithDialog *dialog,
GAppInfo *application)
{
-@@ -283,7 +367,10 @@
+@@ -283,7 +367,10 @@ response_cb (NautilusOpenWithDialog *dia
switch (response_id) {
case RESPONSE_OPEN:
@@ -157,7 +159,7 @@
application = add_or_find_application (dialog);
if (application) {
-@@ -412,9 +499,9 @@
+@@ -412,9 +499,9 @@ entry_changed_cb (GtkWidget *entry,
}
static GdkPixbuf *
@@ -169,7 +171,7 @@
char *filename;
pixbuf = NULL;
-@@ -425,24 +512,43 @@
+@@ -425,24 +512,43 @@ get_pixbuf_for_icon (GIcon *icon)
}
g_free (filename);
} else if (G_IS_THEMED_ICON (icon)) {
@@ -227,7 +229,7 @@
}
}
return pixbuf;
-@@ -456,20 +562,32 @@
+@@ -456,20 +562,32 @@ nautilus_open_with_dialog_add_icon_idle
GdkPixbuf *pixbuf;
GIcon *icon;
gboolean long_operation;
@@ -266,7 +268,7 @@
&iter, path)) {
gtk_tree_path_free (path);
continue;
-@@ -477,17 +595,17 @@
+@@ -477,17 +595,17 @@ nautilus_open_with_dialog_add_icon_idle
gtk_tree_path_free (path);
@@ -287,7 +289,7 @@
g_object_unref (pixbuf);
}
-@@ -563,6 +681,23 @@
+@@ -563,6 +681,23 @@ nautilus_open_with_search_equal_func (Gt
}
}
@@ -311,7 +313,7 @@
static gboolean
-@@ -645,39 +780,170 @@
+@@ -645,39 +780,170 @@ nautilus_open_with_dialog_add_items_idle
return FALSE;
}
@@ -481,7 +483,7 @@
+ GAppInfo *info = NULL;
+ const char *exec = NULL;
+ const char *desc = NULL;
-+ gtk_tree_model_get (model, COLUMN_APP_INFO, &info, -1);
++ gtk_tree_model_get (model, &iter, COLUMN_APP_INFO, &info, -1);
+ if (info) {
+ exec = g_app_info_get_executable (info);
+ desc = g_app_info_get_description (info);
@@ -500,7 +502,7 @@
}
static void
-@@ -687,9 +953,15 @@
+@@ -687,9 +953,15 @@ program_list_selection_activated (GtkTre
NautilusOpenWithDialog *dialog)
{
GtkTreeSelection *selection;
@@ -517,7 +519,7 @@
program_list_selection_changed (selection, dialog);
gtk_dialog_response (GTK_DIALOG (&dialog->parent), RESPONSE_OPEN);
-@@ -711,16 +983,48 @@
+@@ -711,16 +983,48 @@ expander_toggled (GtkWidget *expander, N
}
static void
@@ -567,7 +569,7 @@
dialog->details = g_new0 (NautilusOpenWithDialogDetails, 1);
-@@ -732,6 +1036,8 @@
+@@ -732,6 +1036,8 @@ nautilus_open_with_dialog_instance_init
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
@@ -576,7 +578,7 @@
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-@@ -741,10 +1047,12 @@
+@@ -741,10 +1047,12 @@ nautilus_open_with_dialog_instance_init
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);
@@ -590,7 +592,7 @@
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_size_request (scrolled_window, 400, 300);
-@@ -781,8 +1089,6 @@
+@@ -781,8 +1089,6 @@ nautilus_open_with_dialog_instance_init
(GSourceFunc) nautilus_open_with_dialog_add_items_idle,
dialog, NULL);
@@ -599,7 +601,7 @@
gtk_widget_show_all (vbox);
-@@ -809,6 +1115,60 @@
+@@ -809,6 +1115,60 @@ nautilus_open_with_dialog_instance_init
gtk_box_pack_start (GTK_BOX (hbox), dialog->details->button, FALSE, FALSE, 0);
gtk_widget_show (dialog->details->button);
@@ -660,7 +662,7 @@
gtk_dialog_add_button (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL);
-@@ -825,12 +1185,12 @@
+@@ -825,12 +1185,12 @@ nautilus_open_with_dialog_instance_init
hbox = gtk_hbox_new (FALSE, 2);
gtk_widget_show (hbox);
@@ -678,7 +680,7 @@
align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_widget_show (align);
-@@ -838,7 +1198,6 @@
+@@ -838,7 +1198,6 @@ nautilus_open_with_dialog_instance_init
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