← Back to branch summary

~ubuntu-branches/ubuntu/raring/nautilus/raring

« back to all changes in this revision

Viewing changes to src/nautilus-location-bar.c

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Jeremy Bicha
  • Date: 2012-01-31 13:45:01 UTC
  • mfrom: (1.17.25)
  • Revision ID: package-import@ubuntu.com-20120131134501-yn7mqny7fgzx9fao
Tags: 1:3.3.4-0ubuntu1
https://launchpad.net/bugs/126540
https://launchpad.net/bugs/61786
https://launchpad.net/bugs/503330
https://launchpad.net/bugs/846289
https://launchpad.net/bugs/575719
https://launchpad.net/bugs/230098
* New upstream version which fixes:
  - "Opening Popupmenu in Context of Folder with List-View impossible?"
    (lp: #126540)
  - "'Create folder in here' context menu option for nautilus" (lp: #61786)
  - the file count and the size count change in opposite direction.
    (lp: #503330)
  - the mounts in the place menu should have a properties entry.
    (lp: #846289)
  - add command line option to select file (lp: #575719)
  - Media in 'Places' side bar should have same context menu as in 
    'Computer' (lp: #230098)
* debian/nautilus-data.install:
  - updated, ui and icons have been moved into gresources
* debian/patches/05_desktop_menu_export.patch:
   - updated to correctly include the gresources desktop definition

[ Jeremy Bicha ]
* New upstream release.
* debian/control.in:
  - Bump minimum GTK and glib
* Refreshed patches
* Dropped upstream patches:
  - 17_dont_allow_new_tab_on_desktop.patch
  - 18_fix_crash_in_get_current_uri.patch
  - 19_lazily_initialize_notification_service.patch
  - git_sideplace_sorting.patch
  - git_next_row.patch
  - git_dont_document_browser_option.patch
  - git_browser_compat.patch
  - git_bookmarks_reordering.patch
  - git_listview_context_menus.patch
  - git_use_gtk_grid.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/nautilus-location-bar.c
35
35
 
36
36
#include "nautilus-application.h"
37
37
#include "nautilus-location-entry.h"
38
 
#include "nautilus-window-private.h"
39
38
#include "nautilus-window.h"
40
39
#include <eel/eel-accessibility.h>
41
40
#include <eel/eel-glib-extensions.h>
42
 
#include <eel/eel-gtk-macros.h>
43
41
#include <eel/eel-stock-dialogs.h>
44
42
#include <eel/eel-string.h>
45
43
#include <eel/eel-vfs-extensions.h>
251
249
                gtk_selection_data_set (selection_data,
252
250
                                        gtk_selection_data_get_target (selection_data),
253
251
                                        8, (guchar *) entry_text,
254
 
                                        eel_strlen (entry_text));
 
252
                                        strlen (entry_text));
255
253
                break;
256
254
        default:
257
255
                g_assert_not_reached ();
307
305
        }
308
306
 
309
307
        window = nautilus_location_bar_get_window (gtk_widget_get_parent (widget));
310
 
        slot = NAUTILUS_WINDOW (window)->details->active_pane->active_slot;
 
308
        slot = nautilus_window_get_active_slot (window);
311
309
        view = slot->content_view;
312
310
        label = gtk_bin_get_child (GTK_BIN (widget));
313
311
        /* only pop-up if the URI in the entry matches the displayed location */