← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libnautilus-private/nautilus-desktop-link-monitor.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:
libnautilus-private/nautilus-desktop-link-monitor.c
31
31
#include "nautilus-global-preferences.h"
32
32
 
33
33
#include <eel/eel-debug.h>
34
 
#include <eel/eel-gtk-macros.h>
35
 
#include <eel/eel-glib-extensions.h>
36
34
#include <eel/eel-vfs-extensions.h>
37
35
#include <eel/eel-stock-dialogs.h>
38
36
#include <gtk/gtk.h>
57
55
        GList *mount_links;
58
56
};
59
57
 
60
 
 
61
 
static void nautilus_desktop_link_monitor_init       (gpointer              object,
62
 
                                                      gpointer              klass);
63
 
static void nautilus_desktop_link_monitor_class_init (gpointer              klass);
64
 
 
65
 
EEL_CLASS_BOILERPLATE (NautilusDesktopLinkMonitor,
66
 
                       nautilus_desktop_link_monitor,
67
 
                       G_TYPE_OBJECT)
 
58
G_DEFINE_TYPE (NautilusDesktopLinkMonitor, nautilus_desktop_link_monitor, G_TYPE_OBJECT);
68
59
 
69
60
static NautilusDesktopLinkMonitor *the_link_monitor = NULL;
70
61
 
395
386
}
396
387
 
397
388
static void
398
 
nautilus_desktop_link_monitor_init (gpointer object, gpointer klass)
 
389
nautilus_desktop_link_monitor_init (NautilusDesktopLinkMonitor *monitor)
399
390
{
400
 
        NautilusDesktopLinkMonitor *monitor;
401
391
        GList *l, *mounts;
402
392
        GMount *mount;
403
393
 
404
 
        monitor = NAUTILUS_DESKTOP_LINK_MONITOR (object);
 
394
        monitor->details = G_TYPE_INSTANCE_GET_PRIVATE (monitor, NAUTILUS_TYPE_DESKTOP_LINK_MONITOR,
 
395
                                                        NautilusDesktopLinkMonitorDetails);
405
396
 
406
397
        the_link_monitor = monitor;
407
 
 
408
 
        monitor->details = g_new0 (NautilusDesktopLinkMonitorDetails, 1);
409
 
 
410
398
        monitor->details->volume_monitor = g_volume_monitor_get ();
411
399
 
412
400
        /* We keep around a ref to the desktop dir */
534
522
                g_source_remove (monitor->details->changed_id);
535
523
        }
536
524
 
537
 
        g_free (monitor->details);
538
 
 
539
 
        EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
 
525
        G_OBJECT_CLASS (nautilus_desktop_link_monitor_parent_class)->finalize (object);
540
526
}
541
527
 
542
528
static void
543
 
nautilus_desktop_link_monitor_class_init (gpointer klass)
 
529
nautilus_desktop_link_monitor_class_init (NautilusDesktopLinkMonitorClass *klass)
544
530
{
545
531
        GObjectClass *object_class;
546
532
 
547
533
        object_class = G_OBJECT_CLASS (klass);
548
 
 
549
534
        object_class->finalize = desktop_link_monitor_finalize;
550
535
 
 
536
        g_type_class_add_private (klass, sizeof (NautilusDesktopLinkMonitorDetails));
551
537
}