← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/cairo-dock/oneiric

« back to all changes in this revision

Viewing changes to src/icon-factory/cairo-dock-desktop-file-factory.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2010-09-07 20:31:25 UTC
  • mto: (18.1.1 cairo-dock) (19.1.1 cairo-dock)
  • mto: This revision was merged to the branch mainline in revision 14.
  • Revision ID: james.westby@ubuntu.com-20100907203125-a91ch8odv2r6ziic
Tags: upstream-2.2.0~0rc1
Import upstream version 2.2.0~0rc1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/icon-factory/cairo-dock-desktop-file-factory.c
261
261
gchar *cairo_dock_add_desktop_file_from_uri (const gchar *cURI, const gchar *cDockName, double fOrder, CairoDockIconType iGroup, GError **erreur)
262
262
{
263
263
        g_return_val_if_fail (cURI != NULL, NULL);
 
264
        if (iGroup != CAIRO_DOCK_LAUNCHER && iGroup != CAIRO_DOCK_APPLET)  // on n'autorise a placer des icones du theme que parmi les lanceurs ou les applets.
 
265
                iGroup = CAIRO_DOCK_LAUNCHER;
264
266
        cd_message ("%s (%s)", __func__, cURI);
265
267
        /**double fEffectiveOrder;
266
268
        if (fOrder == CAIRO_DOCK_LAST_ORDER && pDock != NULL)