← 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-gui-factory.c

  • Committer: Fabrice Rey
  • Date: 2012-12-17 23:26:50 UTC
  • Revision ID: fabounet03@gmail.com-20121217232650-rpf76vs3atpq8mxc
Icons: changed the sizing algorithm, added allocated and requested size

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gldit/cairo-dock-gui-factory.c
62
62
#endif
63
63
 
64
64
extern gchar *g_cExtrasDirPath;
65
 
extern gchar *g_cConfFile;
66
65
extern gboolean g_bUseOpenGL;
67
66
extern CairoDockDesktopGeometry g_desktopGeometry;
68
67
extern CairoDock *g_pMainDock;
1142
1141
        if (pDock != NULL)  // peut etre NULL (entree vide)
1143
1142
        {
1144
1143
                Icon *pPointingIcon = cairo_dock_search_icon_pointing_on_dock (pDock, NULL);
1145
 
                if (CAIRO_DOCK_ICON_TYPE_IS_APPLET (pPointingIcon) || CAIRO_DOCK_ICON_TYPE_IS_FILE (pPointingIcon) || CAIRO_DOCK_ICON_TYPE_IS_CLASS_CONTAINER (pPointingIcon))  // on evite les sous-docks d'applet, de classe, et de repertoire.
 
1144
                if (CAIRO_DOCK_ICON_TYPE_IS_APPLET (pPointingIcon) || CAIRO_DOCK_ICON_TYPE_IS_CLASS_CONTAINER (pPointingIcon))  // on evite les sous-docks d'applet et de classe.
1146
1145
                        return ;
1147
1146
                if (pDock->iRefCount == 0)
1148
1147
                        cUserName = cairo_dock_get_readable_name_for_fock (pDock);