r23797 - in /desktop/experimental/nautilus/debian: changelog patches/03_deprecated.patch patches/12_list-view_expand.patch patches/20_open-with_install.patch
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Tue Apr 13 23:40:03 UTC 2010
Author: biebl
Date: Tue Apr 13 23:40:02 2010
New Revision: 23797
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23797
Log:
Refresh patches to apply cleanly.
Modified:
desktop/experimental/nautilus/debian/changelog
desktop/experimental/nautilus/debian/patches/03_deprecated.patch
desktop/experimental/nautilus/debian/patches/12_list-view_expand.patch
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=23797&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog [utf-8] (original)
+++ desktop/experimental/nautilus/debian/changelog [utf-8] Tue Apr 13 23:40:02 2010
@@ -14,6 +14,7 @@
- Add support for tracker 0.8.
* debian/patches/90_relibtoolize.patch
- Update build system accordingly.
+ * Refresh patches to apply cleanly.
-- Michael Biebl <biebl at debian.org> Fri, 09 Apr 2010 10:09:10 +0200
Modified: desktop/experimental/nautilus/debian/patches/03_deprecated.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/03_deprecated.patch?rev=23797&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/03_deprecated.patch [utf-8] (original)
+++ desktop/experimental/nautilus/debian/patches/03_deprecated.patch [utf-8] Tue Apr 13 23:40:02 2010
@@ -1,8 +1,8 @@
-Index: nautilus-2.28.4/configure.in
+Index: nautilus-2.30.0/configure.in
===================================================================
---- nautilus-2.28.4.orig/configure.in 2010-04-09 01:58:36.670222898 +0200
-+++ nautilus-2.28.4/configure.in 2010-04-09 01:58:49.622718158 +0200
-@@ -398,7 +398,7 @@ AC_SUBST(CORE_CFLAGS)
+--- nautilus-2.30.0.orig/configure.in 2010-03-29 10:30:52.000000000 +0200
++++ nautilus-2.30.0/configure.in 2010-04-13 22:41:28.779710364 +0200
+@@ -339,7 +339,7 @@
CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
AC_SUBST(CORE_LIBS)
Modified: desktop/experimental/nautilus/debian/patches/12_list-view_expand.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/12_list-view_expand.patch?rev=23797&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/12_list-view_expand.patch [utf-8] (original)
+++ desktop/experimental/nautilus/debian/patches/12_list-view_expand.patch [utf-8] Tue Apr 13 23:40:02 2010
@@ -1,7 +1,9 @@
Revert upstream commits r12779 and r13045.
We can do this because we fix GNOME #316087 in our GTK+ packages.
---- a/src/file-manager/fm-list-view.c
-+++ b/src/file-manager/fm-list-view.c
+Index: nautilus-2.30.0/src/file-manager/fm-list-view.c
+===================================================================
+--- nautilus-2.30.0.orig/src/file-manager/fm-list-view.c 2010-03-17 11:14:05.000000000 +0100
++++ nautilus-2.30.0/src/file-manager/fm-list-view.c 2010-04-13 23:16:30.475711298 +0200
@@ -58,7 +58,6 @@
#include <libnautilus-private/nautilus-view-factory.h>
#include <libnautilus-private/nautilus-clipboard.h>
@@ -10,7 +12,7 @@
struct FMListViewDetails {
GtkTreeView *tree_view;
-@@ -1423,7 +1422,7 @@
+@@ -1478,7 +1477,7 @@
for (l = nautilus_columns; l != NULL; l = l->next) {
NautilusColumn *nautilus_column;
@@ -19,7 +21,7 @@
char *name;
char *label;
float xalign;
-@@ -1446,6 +1445,9 @@
+@@ -1501,6 +1500,9 @@
view->details->pixbuf_cell = (GtkCellRendererPixbuf *)cell;
view->details->file_name_column = gtk_tree_view_column_new ();
@@ -29,7 +31,7 @@
g_object_ref_sink (view->details->file_name_column);
view->details->file_name_column_num = column_num;
-@@ -1466,7 +1468,11 @@
+@@ -1521,7 +1523,11 @@
"pixbuf_emblem", FM_LIST_MODEL_SMALLEST_EMBLEM_COLUMN,
NULL);
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=23797&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/20_open-with_install.patch [utf-8] (original)
+++ desktop/experimental/nautilus/debian/patches/20_open-with_install.patch [utf-8] Tue Apr 13 23:40:02 2010
@@ -3,8 +3,10 @@
synaptic to install them. Closes: #435022.
---- a/libnautilus-private/nautilus-open-with-dialog.c
-+++ b/libnautilus-private/nautilus-open-with-dialog.c
+Index: nautilus-2.30.0/libnautilus-private/nautilus-open-with-dialog.c
+===================================================================
+--- nautilus-2.30.0.orig/libnautilus-private/nautilus-open-with-dialog.c 2009-12-15 11:22:12.000000000 +0100
++++ nautilus-2.30.0/libnautilus-private/nautilus-open-with-dialog.c 2010-04-13 23:20:20.639713199 +0200
@@ -32,6 +32,7 @@
#include <eel/eel-stock-dialogs.h>
@@ -31,32 +33,32 @@
char *content_type;
char *extension;
- char *type_description;
+ GtkWidget *notebook;
+
GtkWidget *label;
GtkWidget *entry;
GtkWidget *button;
+ GtkWidget *checkbox;
GtkWidget *desc_label;
+ GtkWidget *desc_label2;
GtkWidget *open_label;
-@@ -59,6 +72,11 @@
- GSList *add_icon_paths;
+@@ -60,6 +73,11 @@
gint add_items_idle_id;
gint add_icons_idle_id;
-+
+
+ GtkWidget *avail_program_list;
+ GtkListStore *avail_program_list_store;
+ GSList *add_icon_avail_paths;
+ gint add_avail_items_idle_id;
++
+ gboolean add_mode;
};
- enum {
-@@ -71,6 +89,9 @@
+@@ -73,6 +91,9 @@
NUM_COLUMNS
};
@@ -66,7 +68,7 @@
enum {
RESPONSE_OPEN,
RESPONSE_REMOVE
-@@ -99,6 +120,10 @@
+@@ -101,6 +122,10 @@
g_source_remove (dialog->details->add_items_idle_id);
}
@@ -77,7 +79,7 @@
if (dialog->details->selected_app_info) {
g_object_unref (dialog->details->selected_app_info);
}
-@@ -111,6 +136,15 @@
+@@ -112,6 +137,15 @@
G_OBJECT_CLASS (nautilus_open_with_dialog_parent_class)->finalize (object);
}
@@ -93,7 +95,7 @@
static void
nautilus_open_with_dialog_destroy (GtkObject *object)
{
-@@ -268,6 +302,56 @@
+@@ -273,6 +307,56 @@
}
static void
@@ -150,7 +152,7 @@
emit_application_selected (NautilusOpenWithDialog *dialog,
GAppInfo *application)
{
-@@ -284,7 +368,10 @@
+@@ -289,7 +373,10 @@
switch (response_id) {
case RESPONSE_OPEN:
@@ -162,7 +164,7 @@
application = add_or_find_application (dialog);
if (application) {
-@@ -297,6 +384,9 @@
+@@ -302,6 +389,9 @@
break;
case RESPONSE_REMOVE:
@@ -172,7 +174,7 @@
if (dialog->details->selected_app_info != NULL) {
if (g_app_info_delete (dialog->details->selected_app_info)) {
GtkTreeModel *model;
-@@ -438,9 +528,9 @@
+@@ -443,9 +533,9 @@
}
static GdkPixbuf *
@@ -184,7 +186,7 @@
char *filename;
pixbuf = NULL;
-@@ -451,24 +541,43 @@
+@@ -456,24 +546,43 @@
}
g_free (filename);
} else if (G_IS_THEMED_ICON (icon)) {
@@ -242,7 +244,7 @@
}
}
return pixbuf;
-@@ -482,20 +591,32 @@
+@@ -487,20 +596,32 @@
GdkPixbuf *pixbuf;
GIcon *icon;
gboolean long_operation;
@@ -281,7 +283,7 @@
&iter, path)) {
gtk_tree_path_free (path);
continue;
-@@ -503,17 +624,17 @@
+@@ -508,17 +629,17 @@
gtk_tree_path_free (path);
@@ -302,7 +304,7 @@
g_object_unref (pixbuf);
}
-@@ -589,6 +710,23 @@
+@@ -594,6 +715,23 @@
}
}
@@ -326,7 +328,7 @@
static gboolean
-@@ -674,13 +812,136 @@
+@@ -679,13 +817,136 @@
return FALSE;
}
@@ -466,7 +468,7 @@
if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
gtk_widget_set_sensitive (dialog->details->button, FALSE);
-@@ -689,30 +950,50 @@
+@@ -694,30 +955,50 @@
FALSE);
return;
}
@@ -536,7 +538,7 @@
}
static void
-@@ -722,9 +1003,15 @@
+@@ -727,9 +1008,15 @@
NautilusOpenWithDialog *dialog)
{
GtkTreeSelection *selection;
@@ -553,7 +555,7 @@
program_list_selection_changed (selection, dialog);
gtk_dialog_response (GTK_DIALOG (&dialog->parent), RESPONSE_OPEN);
-@@ -746,16 +1033,45 @@
+@@ -751,16 +1038,45 @@
}
static void
@@ -600,7 +602,7 @@
dialog->details = g_new0 (NautilusOpenWithDialogDetails, 1);
-@@ -767,6 +1083,8 @@
+@@ -772,6 +1088,8 @@
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
@@ -609,7 +611,7 @@
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-@@ -776,10 +1094,12 @@
+@@ -781,10 +1099,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);
@@ -623,7 +625,7 @@
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_size_request (scrolled_window, 400, 300);
-@@ -816,8 +1136,6 @@
+@@ -821,8 +1141,6 @@
(GSourceFunc) nautilus_open_with_dialog_add_items_idle,
dialog, NULL);
@@ -632,7 +634,7 @@
gtk_widget_show_all (vbox);
-@@ -851,6 +1169,60 @@
+@@ -863,6 +1181,60 @@
RESPONSE_REMOVE,
FALSE);
@@ -693,7 +695,7 @@
gtk_dialog_add_button (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL);
-@@ -867,12 +1239,12 @@
+@@ -879,12 +1251,12 @@
hbox = gtk_hbox_new (FALSE, 2);
gtk_widget_show (hbox);
@@ -711,7 +713,7 @@
align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_widget_show (align);
-@@ -880,7 +1252,6 @@
+@@ -892,7 +1264,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