← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/nautilus-location-entry.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-entry.c
35
35
 
36
36
#include "nautilus-window-private.h"
37
37
#include "nautilus-window.h"
38
 
#include <eel/eel-glib-extensions.h>
39
 
#include <eel/eel-gtk-macros.h>
40
 
#include <eel/eel-stock-dialogs.h>
41
 
#include <eel/eel-string.h>
42
38
#include <gtk/gtk.h>
43
39
#include <gdk/gdkkeysyms.h>
44
40
#include <glib/gi18n.h>
64
60
        NautilusLocationEntryAction secondary_action;
65
61
};
66
62
 
67
 
static void  nautilus_location_entry_class_init       (NautilusLocationEntryClass *class);
68
 
static void  nautilus_location_entry_init             (NautilusLocationEntry      *entry);
69
 
 
70
 
EEL_CLASS_BOILERPLATE (NautilusLocationEntry,
71
 
                       nautilus_location_entry,
72
 
                       NAUTILUS_TYPE_ENTRY)
 
63
G_DEFINE_TYPE (NautilusLocationEntry, nautilus_location_entry, NAUTILUS_TYPE_ENTRY);
73
64
 
74
65
/* routine that performs the tab expansion.  Extract the directory name and
75
66
   incomplete basename, then iterate through the directory trying to complete it.  If we
259
250
 
260
251
        g_object_unref (entry->details->completer);
261
252
        g_free (entry->details->special_text);
262
 
        g_free (entry->details);
263
253
 
264
 
        EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
 
254
        G_OBJECT_CLASS (nautilus_location_entry_parent_class)->finalize (object);
265
255
}
266
256
 
267
257
static void
280
270
        g_free (entry->details->current_directory);
281
271
        entry->details->current_directory = NULL;
282
272
        
283
 
        EEL_CALL_PARENT (GTK_WIDGET_CLASS, destroy, (object));
 
273
        GTK_WIDGET_CLASS (nautilus_location_entry_parent_class)->destroy (object);
284
274
}
285
275
 
286
276
static void
324
314
                entry->details->setting_special_text = FALSE;
325
315
        }
326
316
 
327
 
        return EEL_CALL_PARENT_WITH_RETURN_VALUE (GTK_WIDGET_CLASS, focus_in_event, (widget, event));
 
317
        return GTK_WIDGET_CLASS (nautilus_location_entry_parent_class)->focus_in_event (widget, event);
328
318
}
329
319
 
330
320
static void
350
340
                g_free (uri_scheme);
351
341
        }
352
342
 
353
 
        EEL_CALL_PARENT (GTK_ENTRY_CLASS, activate, (entry));
 
343
        GTK_ENTRY_CLASS (nautilus_location_entry_parent_class)->activate (entry);
354
344
}
355
345
 
356
346
static void
369
359
 
370
360
        entry_class = GTK_ENTRY_CLASS (class);
371
361
        entry_class->activate = nautilus_location_entry_activate;
 
362
 
 
363
        g_type_class_add_private (class, sizeof (NautilusLocationEntryDetails));
372
364
}
373
365
 
374
366
void
409
401
static void
410
402
nautilus_location_entry_init (NautilusLocationEntry *entry)
411
403
{
412
 
        entry->details = g_new0 (NautilusLocationEntryDetails, 1);
 
404
        entry->details = G_TYPE_INSTANCE_GET_PRIVATE (entry, NAUTILUS_TYPE_LOCATION_ENTRY,
 
405
                                                      NautilusLocationEntryDetails);
413
406
 
414
407
        entry->details->completer = g_filename_completer_new ();
415
408
        g_filename_completer_set_dirs_only (entry->details->completer, TRUE);