← Back to branch summary

~didrocks/cairo-dock-plug-ins/fix-abi-transition

« back to all changes in this revision

Viewing changes to gnome-integration/src/applet-init.c

  • Committer: matttbe
  • Date: 2010-08-07 01:43:25 UTC
  • Revision ID: matttbe@gmail.com-20100807014325-36tmlrc8n1rrksk5
https://launchpad.net/bugs/483963
https://launchpad.net/bugs/485159
https://launchpad.net/bugs/500677
https://launchpad.net/bugs/500979
https://launchpad.net/bugs/519915
https://launchpad.net/bugs/521531
https://launchpad.net/bugs/526138
https://launchpad.net/bugs/531317
https://launchpad.net/bugs/531319
https://launchpad.net/bugs/537115
https://launchpad.net/bugs/537943
https://launchpad.net/bugs/538637
https://launchpad.net/bugs/614625
* New Upstream Version (LP: #614625)
* debian/rules:
 - Autotools has been replaced by CMake
 - cdbs is now used.
* debian/copyright:
 - Updated with the new applets
* debian/control:
 - Autotools has been replaced by CMake
 - Added libcurl4-gnutls-dev, libindicator-dev, libdbusmenu-glib-dev
   libido-0.1-dev, libical-dev, libdbusmenu-gtk-dev as Build-deps
 - Bump Standard-Version to 3.9.1
 - Wget is required for dnd2share applet
* debian/cairo-dock-plug-ins*.install:
 - All sonames are now installed into lib32 or lib64 (lib*)
* Fixed a few bugs on LP:
 - LP: #483963, LP: #485159, LP: #500677, LP: #500979
 - LP: #521531, LP: #519915, LP: #526138, LP: #531317
 - LP: #531319, LP: #537115, LP: #537943, LP: #538637
 - More details on the 'ChangeLog' file

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome-integration/src/applet-init.c
19
19
 
20
20
#include "stdlib.h"
21
21
 
22
 
#include "applet-gvfs.h"
 
22
#include "cairo-dock-gio-vfs.h"
 
23
 
23
24
#include "applet-utils.h"
24
25
#include "applet-init.h"
25
26
 
26
27
 
27
 
CD_APPLET_PRE_INIT_BEGIN ("gnome integration",
 
28
CD_APPLET_DEFINE_BEGIN ("gnome integration",
28
29
        1, 6, 2,
29
 
        CAIRO_DOCK_CATEGORY_PLUG_IN,
 
30
        CAIRO_DOCK_CATEGORY_APPLET_SYSTEM,
30
31
        N_("This applet provides functions for a better integration into a GNOME environnement.\n"
31
32
        "It is auto-activated, so you don't need to activate it.\n"
32
33
        "It is designed for the a GNOME version >= 2.22"),
33
34
        "Fabounet (Fabrice Rey)")
34
35
        if (g_iDesktopEnv == CAIRO_DOCK_GNOME && (glib_major_version > 2 || glib_minor_version >= 16))
35
36
        {
36
 
                if (init_vfs_backend ())
 
37
                cd_debug ("GNOME");
 
38
                if (cairo_dock_gio_vfs_init ())
37
39
                {
 
40
                        cd_debug ("GVFS");
38
41
                        CairoDockDesktopEnvBackend *pVFSBackend = g_new0 (CairoDockDesktopEnvBackend, 1);
39
 
                        pVFSBackend->get_file_info = vfs_backend_get_file_info;
40
 
                        pVFSBackend->get_file_properties = vfs_backend_get_file_properties;
41
 
                        pVFSBackend->list_directory = vfs_backend_list_directory;
42
 
                        pVFSBackend->launch_uri = vfs_backend_launch_uri;
43
 
                        pVFSBackend->is_mounted = vfs_backend_is_mounted;
44
 
                        pVFSBackend->can_eject = vfs_backend_can_eject;
45
 
                        pVFSBackend->eject = vfs_backend_eject_drive;
46
 
                        pVFSBackend->mount = vfs_backend_mount;
47
 
                        pVFSBackend->unmount = vfs_backend_unmount;
48
 
                        pVFSBackend->add_monitor = vfs_backend_add_monitor;
49
 
                        pVFSBackend->remove_monitor = vfs_backend_remove_monitor;
50
 
                        pVFSBackend->delete_file = vfs_backend_delete_file;
51
 
                        pVFSBackend->rename = vfs_backend_rename_file;
52
 
                        pVFSBackend->move = vfs_backend_move_file;
53
 
                        pVFSBackend->get_trash_path = vfs_backend_get_trash_path;
54
 
                        pVFSBackend->get_desktop_path = vfs_backend_get_desktop_path;
 
42
                        
 
43
                        cairo_dock_gio_vfs_fill_backend(pVFSBackend);
 
44
                        
55
45
                        pVFSBackend->logout = env_backend_logout;
56
46
                        pVFSBackend->shutdown = env_backend_shutdown;
 
47
                        pVFSBackend->lock_screen = env_backend_lock_screen;
57
48
                        pVFSBackend->setup_time = env_backend_setup_time;
58
49
                        pVFSBackend->show_system_monitor = env_backend_show_system_monitor;
59
50
                        cairo_dock_fm_register_vfs_backend (pVFSBackend);
61
52
        }
62
53
        else
63
54
                return FALSE;
64
 
CD_APPLET_PRE_INIT_END
 
55
        CD_APPLET_SET_CONTAINER_TYPE (CAIRO_DOCK_MODULE_IS_PLUGIN);
 
56
CD_APPLET_DEFINE_END