← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/nautilus-empty-view.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-empty-view.c
31
31
 
32
32
#include <string.h>
33
33
#include <libnautilus-private/nautilus-file-utilities.h>
34
 
#include <eel/eel-glib-extensions.h>
35
 
#include <eel/eel-gtk-macros.h>
36
34
#include <eel/eel-vfs-extensions.h>
37
35
 
38
36
struct NautilusEmptyViewDetails {
46
44
 
47
45
G_DEFINE_TYPE (NautilusEmptyView, nautilus_empty_view, NAUTILUS_TYPE_VIEW)
48
46
 
49
 
/* for EEL_CALL_PARENT */
50
 
#define parent_class nautilus_empty_view_parent_class
51
 
 
52
47
static void
53
48
nautilus_empty_view_add_file (NautilusView *view, NautilusFile *file, NautilusDirectory *directory)
54
49
{
144
139
static void
145
140
nautilus_empty_view_merge_menus (NautilusView *view)
146
141
{
147
 
        EEL_CALL_PARENT (NAUTILUS_VIEW_CLASS, merge_menus, (view));
 
142
        NAUTILUS_VIEW_CLASS (nautilus_empty_view_parent_class)->merge_menus (view);
148
143
}
149
144
 
150
145
static void
151
146
nautilus_empty_view_update_menus (NautilusView *view)
152
147
{
153
 
        EEL_CALL_PARENT (NAUTILUS_VIEW_CLASS, update_menus, (view));
 
148
        NAUTILUS_VIEW_CLASS (nautilus_empty_view_parent_class)->update_menus (view);
154
149
}
155
150
 
156
151
/* Reset sort criteria and zoom level to match defaults */
232
227
{
233
228
}
234
229
 
235
 
static void
236
 
nautilus_empty_view_finalize (GObject *object)
237
 
{
238
 
        NautilusEmptyView *empty_view;
239
 
 
240
 
        empty_view = NAUTILUS_EMPTY_VIEW (object);
241
 
        g_free (empty_view->details);
242
 
 
243
 
        G_OBJECT_CLASS (parent_class)->finalize (object);
244
 
}
245
 
 
246
230
static char *
247
231
nautilus_empty_view_get_first_visible_file (NautilusView *view)
248
232
{
271
255
{
272
256
        NautilusViewClass *nautilus_view_class;
273
257
 
 
258
        g_type_class_add_private (class, sizeof (NautilusEmptyViewDetails));
 
259
 
274
260
        nautilus_view_class = NAUTILUS_VIEW_CLASS (class);
275
261
 
276
 
        G_OBJECT_CLASS (class)->finalize = nautilus_empty_view_finalize;
277
 
 
278
262
        nautilus_view_class->add_file = nautilus_empty_view_add_file;
279
263
        nautilus_view_class->begin_loading = nautilus_empty_view_begin_loading;
280
264
        nautilus_view_class->bump_zoom_level = nautilus_empty_view_bump_zoom_level;
311
295
static void
312
296
nautilus_empty_view_init (NautilusEmptyView *empty_view)
313
297
{
314
 
        empty_view->details = g_new0 (NautilusEmptyViewDetails, 1);
 
298
        empty_view->details = G_TYPE_INSTANCE_GET_PRIVATE (empty_view, NAUTILUS_TYPE_EMPTY_VIEW,
 
299
                                                           NautilusEmptyViewDetails);
315
300
}
316
301
 
317
302
static NautilusView *