diff -u nautilus-2.30.0/debian/changelog nautilus-2.30.0/debian/changelog --- nautilus-2.30.0/debian/changelog +++ nautilus-2.30.0/debian/changelog @@ -1,3 +1,14 @@ +nautilus (1:2.30.0-0ubuntu4) lucid; urgency=low + + * debian/patches/91_git_middleclick_crash.patch: + - git change to fix a crasher when opening non-available bookmark locations + (lp: #444368) + * debian/patches/92_git_emblems_cut.patch: + - git change to fix emblem being cut sometime when zooming + (lp: #46846) + + -- Sebastien Bacher Wed, 07 Apr 2010 11:51:00 +0200 + nautilus (1:2.30.0-0ubuntu3) lucid; urgency=low * Add 16_hide_unmount.patch: Do not show Unmount when showing Eject/Safe diff -u nautilus-2.30.0/debian/patches/series nautilus-2.30.0/debian/patches/series --- nautilus-2.30.0/debian/patches/series +++ nautilus-2.30.0/debian/patches/series @@ -14,6 +14,8 @@ 89_use_application_indicator.patch 90_relibtoolize.patch #91_correct_rgba_use.patch +91_git_middleclick_crash.patch +92_git_emblems_cut.patch 95_no-initial-fade.patch 99_ltmain_as-needed.patch only in patch2: unchanged: --- nautilus-2.30.0.orig/debian/patches/92_git_emblems_cut.patch +++ nautilus-2.30.0/debian/patches/92_git_emblems_cut.patch @@ -0,0 +1,58 @@ +From 305cf9768bd716ba9bbcd3e773511536243a9cc5 Mon Sep 17 00:00:00 2001 +From: Marcus Carlson +Date: Wed, 07 Apr 2010 07:58:04 +0000 +Subject: Fix emblem scaling with zoom >= 150% + +Emblem handling did not properly take zoom into account (#343540) +--- +diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c +index 0e08d31..8c8de44 100644 +--- a/libnautilus-private/nautilus-icon-canvas-item.c ++++ b/libnautilus-private/nautilus-icon-canvas-item.c +@@ -2488,7 +2488,7 @@ static void + nautilus_icon_canvas_item_ensure_bounds_up_to_date (NautilusIconCanvasItem *icon_item) + { + NautilusIconCanvasItemDetails *details; +- EelIRect icon_rect, emblem_rect; ++ EelIRect icon_rect, emblem_rect, icon_rect_raw; + EelIRect text_rect, text_rect_for_layout, text_rect_for_entire_text; + EelIRect total_rect, total_rect_for_layout, total_rect_for_entire_text; + EelCanvasItem *item; +@@ -2505,15 +2505,21 @@ nautilus_icon_canvas_item_ensure_bounds_up_to_date (NautilusIconCanvasItem *icon + + pixels_per_unit = EEL_CANVAS_ITEM (item)->canvas->pixels_per_unit; + +- /* Compute icon rectangle. */ ++ /* Compute raw and scaled icon rectangle. */ + icon_rect.x0 = 0; + icon_rect.y0 = 0; ++ icon_rect_raw.x0 = 0; ++ icon_rect_raw.y0 = 0; + if (details->pixbuf == NULL) { + icon_rect.x1 = icon_rect.x0; + icon_rect.y1 = icon_rect.y0; ++ icon_rect_raw.x1 = icon_rect_raw.x0; ++ icon_rect_raw.y1 = icon_rect_raw.y0; + } else { +- icon_rect.x1 = icon_rect.x0 + gdk_pixbuf_get_width (details->pixbuf) / pixels_per_unit; +- icon_rect.y1 = icon_rect.y0 + gdk_pixbuf_get_height (details->pixbuf) / pixels_per_unit; ++ icon_rect_raw.x1 = icon_rect_raw.x0 + gdk_pixbuf_get_width (details->pixbuf); ++ icon_rect_raw.y1 = icon_rect_raw.y0 + gdk_pixbuf_get_height (details->pixbuf); ++ icon_rect.x1 = icon_rect_raw.x1 / pixels_per_unit; ++ icon_rect.y1 = icon_rect_raw.y1 / pixels_per_unit; + } + + /* Compute text rectangle. */ +@@ -2527,7 +2533,7 @@ nautilus_icon_canvas_item_ensure_bounds_up_to_date (NautilusIconCanvasItem *icon + eel_irect_union (&total_rect, &icon_rect, &text_rect); + eel_irect_union (&total_rect_for_layout, &icon_rect, &text_rect_for_layout); + eel_irect_union (&total_rect_for_entire_text, &icon_rect, &text_rect_for_entire_text); +- emblem_layout_reset (&emblem_layout, icon_item, icon_rect, is_rtl); ++ emblem_layout_reset (&emblem_layout, icon_item, icon_rect_raw, is_rtl); + while (emblem_layout_next (&emblem_layout, &emblem_pixbuf, &emblem_rect, is_rtl)) { + emblem_rect.x0 = floor (emblem_rect.x0 / pixels_per_unit); + emblem_rect.y0 = floor (emblem_rect.y0 / pixels_per_unit); +-- + + + only in patch2: unchanged: --- nautilus-2.30.0.orig/debian/patches/91_git_middleclick_crash.patch +++ nautilus-2.30.0/debian/patches/91_git_middleclick_crash.patch @@ -0,0 +1,52 @@ +From 263051df98aace0b59fb2bd1772711dceba8e404 Mon Sep 17 00:00:00 2001 +From: Marcus Carlson +Date: Wed, 07 Apr 2010 07:55:49 +0000 +Subject: Fix crash when middle click on an invalid network share in Places + +https://bugzilla.gnome.org/show_bug.cgi?id=579627 +--- +diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c +index ac3d6bc..b57b973 100644 +--- a/src/nautilus-window-manage-views.c ++++ b/src/nautilus-window-manage-views.c +@@ -1172,20 +1172,25 @@ got_file_info_for_view_selection_callback (NautilusFile *file, + * cancel_viewed_file_changed_callback (slot); + * at this point, or in end_location_change() + */ +- +- /* We disconnected this, so we need to re-connect it */ +- viewed_file = nautilus_file_get (slot->location); +- nautilus_window_slot_set_viewed_file (slot, viewed_file); +- nautilus_file_monitor_add (viewed_file, &slot->viewed_file, 0); +- g_signal_connect_object (viewed_file, "changed", +- G_CALLBACK (viewed_file_changed_callback), slot, 0); +- nautilus_file_unref (viewed_file); ++ /* We're missing a previous location (if opened location ++ * in a new tab) so close it and return */ ++ if (slot->location == NULL) { ++ nautilus_window_slot_close (slot); ++ } else { ++ /* We disconnected this, so we need to re-connect it */ ++ viewed_file = nautilus_file_get (slot->location); ++ nautilus_window_slot_set_viewed_file (slot, viewed_file); ++ nautilus_file_monitor_add (viewed_file, &slot->viewed_file, 0); ++ g_signal_connect_object (viewed_file, "changed", ++ G_CALLBACK (viewed_file_changed_callback), slot, 0); ++ nautilus_file_unref (viewed_file); + +- /* Leave the location bar showing the bad location that the user +- * typed (or maybe achieved by dragging or something). Many times +- * the mistake will just be an easily-correctable typo. The user +- * can choose "Refresh" to get the original URI back in the location bar. +- */ ++ /* Leave the location bar showing the bad location that the user ++ * typed (or maybe achieved by dragging or something). Many times ++ * the mistake will just be an easily-correctable typo. The user ++ * can choose "Refresh" to get the original URI back in the location bar. ++ */ ++ } + } + } + + +