← Back to branch summary

~cairo-dock-team/cairo-dock-core/popup_from_shortkey

« back to all changes in this revision

Viewing changes to src/gldit/cairo-dock-flying-container.c

  • Committer: Fabrice Rey
  • Date: 2013-06-04 22:58:28 UTC
  • Revision ID: fabounet03@gmail.com-20130604225828-x8lg3mv9135jr114
updated various parts of the core to the new API (new icons type, 'delete' method, simplified functions, etc)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gldit/cairo-dock-flying-container.c
27
27
#include "cairo-dock-icon-factory.h"
28
28
#include "cairo-dock-icon-facility.h"
29
29
#include "cairo-dock-module-instance-manager.h"  // gldi_module_instance_detach_at_position
 
30
#include "cairo-dock-applet-manager.h"  // GLDI_OBJECT_IS_APPLET_ICON
30
31
#include "cairo-dock-config.h"
31
32
#include "cairo-dock-log.h"
32
33
#include "cairo-dock-desklet-factory.h"
62
63
static void _load_emblem (Icon *pIcon)
63
64
{
64
65
        const gchar *cImage = NULL;
65
 
        if (CAIRO_DOCK_ICON_TYPE_IS_APPLET (pIcon))
 
66
        if (GLDI_OBJECT_IS_APPLET_ICON (pIcon))
66
67
        {
67
68
                cImage = GTK_STOCK_JUMP_TO"-rtl";  // GTK_STOCK_JUMP_TO only doesn't exist.
68
69
        }
301
302
        // destroy it, or place it in a desklet.
302
303
        if (pIcon->cDesktopFileName != NULL)  // a launcher/sub-dock/separator, that is part of the theme
303
304
        {
304
 
                cairo_dock_delete_icon_from_current_theme (pIcon);
305
 
                gldi_object_unref (GLDI_OBJECT(pIcon));
 
305
                gldi_object_delete (GLDI_OBJECT(pIcon));
306
306
        }
307
307
        else if (CAIRO_DOCK_IS_APPLET(pIcon))  /// faire une fonction dans la factory ...
308
308
        {