r17041 - in /desktop/experimental/nautilus/debian: changelog patches/20_open-with_install.patch
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Tue Sep 23 18:46:33 UTC 2008
Author: kov
Date: Tue Sep 23 18:46:33 2008
New Revision: 17041
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17041
Log:
preparing a new upstream release
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=17041&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog (original)
+++ desktop/experimental/nautilus/debian/changelog Tue Sep 23 18:46:33 2008
@@ -1,3 +1,11 @@
+nautilus (2.24.0-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * debian/patches/20_open-with_install.patch:
+ - updated to the new version
+
+ -- Gustavo Noronha Silva <kov at debian.org> Tue, 23 Sep 2008 00:05:26 -0300
+
nautilus (2.22.5.1-2) UNRELEASED; urgency=low
* Rename libnautilus-extension1 to libnautilus-extension1a as the ABI
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=17041&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/20_open-with_install.patch (original)
+++ desktop/experimental/nautilus/debian/patches/20_open-with_install.patch Tue Sep 23 18:46:33 2008
@@ -1,24 +1,14 @@
-Index: nautilus-2.22.4/libnautilus-private/nautilus-open-with-dialog.c
-===================================================================
---- 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
+--- 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
@@ -32,6 +32,7 @@
#include <eel/eel-stock-dialogs.h>
#include <string.h>
+#include <unistd.h>
#include <glib/gi18n-lib.h>
- #include <gtk/gtkalignment.h>
- #include <gtk/gtkbox.h>
-@@ -44,6 +45,7 @@
- #include <gtk/gtkicontheme.h>
- #include <gtk/gtkiconfactory.h>
- #include <gtk/gtklabel.h>
-+#include <gtk/gtknotebook.h>
- #include <gtk/gtkscrolledwindow.h>
- #include <gtk/gtkstock.h>
- #include <gtk/gtktreeview.h>
-@@ -56,18 +58,30 @@
+ #include <gtk/gtk.h>
+ #include <gio/gio.h>
+@@ -39,18 +40,30 @@
#define sure_string(s) ((const char *)((s)!=NULL?(s):""))
#define DESKTOP_ENTRY_GROUP "Desktop Entry"
@@ -49,7 +39,7 @@
GtkWidget *open_label;
-@@ -76,6 +90,11 @@
+@@ -59,6 +72,11 @@
GSList *add_icon_paths;
gint add_items_idle_id;
gint add_icons_idle_id;
@@ -61,7 +51,7 @@
};
enum {
-@@ -88,6 +107,9 @@
+@@ -71,6 +89,9 @@
NUM_COLUMNS
};
@@ -71,7 +61,7 @@
enum {
RESPONSE_OPEN
};
-@@ -115,6 +137,10 @@
+@@ -98,6 +119,10 @@
g_source_remove (dialog->details->add_items_idle_id);
}
@@ -82,7 +72,7 @@
if (dialog->details->selected_app_info) {
g_object_unref (dialog->details->selected_app_info);
}
-@@ -127,6 +153,15 @@
+@@ -110,6 +135,15 @@
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@@ -98,7 +88,7 @@
static void
nautilus_open_with_dialog_destroy (GtkObject *object)
{
-@@ -283,6 +318,56 @@
+@@ -267,6 +301,56 @@
}
static void
@@ -155,7 +145,7 @@
emit_application_selected (NautilusOpenWithDialog *dialog,
GAppInfo *application)
{
-@@ -299,7 +384,10 @@
+@@ -283,7 +367,10 @@
switch (response_id) {
case RESPONSE_OPEN:
@@ -167,7 +157,7 @@
application = add_or_find_application (dialog);
if (application) {
-@@ -428,9 +516,9 @@
+@@ -412,9 +499,9 @@
}
static GdkPixbuf *
@@ -179,7 +169,7 @@
char *filename;
pixbuf = NULL;
-@@ -441,24 +529,43 @@
+@@ -425,24 +512,43 @@
}
g_free (filename);
} else if (G_IS_THEMED_ICON (icon)) {
@@ -237,7 +227,7 @@
}
}
return pixbuf;
-@@ -472,20 +579,32 @@
+@@ -456,20 +562,32 @@
GdkPixbuf *pixbuf;
GIcon *icon;
gboolean long_operation;
@@ -276,7 +266,7 @@
&iter, path)) {
gtk_tree_path_free (path);
continue;
-@@ -493,17 +612,17 @@
+@@ -477,17 +595,17 @@
gtk_tree_path_free (path);
@@ -297,7 +287,7 @@
g_object_unref (pixbuf);
}
-@@ -579,6 +698,23 @@
+@@ -563,6 +681,23 @@
}
}
@@ -321,7 +311,7 @@
static gboolean
-@@ -661,39 +797,170 @@
+@@ -645,39 +780,170 @@
return FALSE;
}
@@ -510,7 +500,7 @@
}
static void
-@@ -703,9 +970,15 @@
+@@ -687,9 +953,15 @@
NautilusOpenWithDialog *dialog)
{
GtkTreeSelection *selection;
@@ -527,7 +517,7 @@
program_list_selection_changed (selection, dialog);
gtk_dialog_response (GTK_DIALOG (&dialog->parent), RESPONSE_OPEN);
-@@ -727,16 +1000,48 @@
+@@ -711,16 +983,48 @@
}
static void
@@ -577,7 +567,7 @@
dialog->details = g_new0 (NautilusOpenWithDialogDetails, 1);
-@@ -748,6 +1053,8 @@
+@@ -732,6 +1036,8 @@
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
@@ -586,7 +576,7 @@
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-@@ -757,10 +1064,12 @@
+@@ -741,10 +1047,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);
@@ -600,7 +590,7 @@
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_size_request (scrolled_window, 400, 300);
-@@ -797,8 +1106,6 @@
+@@ -781,8 +1089,6 @@
(GSourceFunc) nautilus_open_with_dialog_add_items_idle,
dialog, NULL);
@@ -609,7 +599,7 @@
gtk_widget_show_all (vbox);
-@@ -825,6 +1132,60 @@
+@@ -809,6 +1115,60 @@
gtk_box_pack_start (GTK_BOX (hbox), dialog->details->button, FALSE, FALSE, 0);
gtk_widget_show (dialog->details->button);
@@ -670,7 +660,7 @@
gtk_dialog_add_button (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL);
-@@ -841,12 +1202,12 @@
+@@ -825,12 +1185,12 @@
hbox = gtk_hbox_new (FALSE, 2);
gtk_widget_show (hbox);
@@ -688,7 +678,7 @@
align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_widget_show (align);
-@@ -854,7 +1215,6 @@
+@@ -838,7 +1198,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