← Back to branch summary

~ubuntu-branches/ubuntu/vivid/cairo-dock-plug-ins/vivid

« back to all changes in this revision

Viewing changes to dock-rendering/src/rendering-caroussel.c

  • Committer: Matthieu Baerts
  • Date: 2013-08-27 14:46:47 UTC
  • mto: (53.1.4 cairo-dock-plug-ins)
  • mto: This revision was merged to the branch mainline in revision 44.
  • Revision ID: matttbe@gmail.com-20130827144647-wm0kyawa8vcg0cso
Tags: upstream-3.2.99.beta1.1~20130827~bzr2928
Import upstream version 3.2.99.beta1.1~20130827~bzr2928

Show diffs side-by-side

added added

removed removed

Lines of Context:
dock-rendering/src/rendering-caroussel.c
84
84
        if (pDock->pRendererData == NULL)
85
85
        {
86
86
                pDock->pRendererData = GINT_TO_POINTER (1);
87
 
                cairo_dock_register_notification_on_object (pDock, NOTIFICATION_UPDATE, (CairoDockNotificationFunc) cd_rendering_caroussel_update_dock, CAIRO_DOCK_RUN_AFTER, NULL);
 
87
                gldi_object_register_notification (pDock, NOTIFICATION_UPDATE, (GldiNotificationFunc) cd_rendering_caroussel_update_dock, GLDI_RUN_AFTER, NULL);
88
88
        }
89
89
        
90
90
        if (g_bEasterEggs)
317
317
{
318
318
        if (pDock->pRendererData != NULL)
319
319
        {
320
 
                cairo_dock_remove_notification_func_on_object (CAIRO_CONTAINER (pDock), NOTIFICATION_UPDATE, (CairoDockNotificationFunc) cd_rendering_caroussel_update_dock, NULL);
 
320
                gldi_object_remove_notification (CAIRO_CONTAINER (pDock), NOTIFICATION_UPDATE, (GldiNotificationFunc) cd_rendering_caroussel_update_dock, NULL);
321
321
        }
322
322
}
323
323
 
369
369
        }
370
370
}
371
371
 
372
 
gboolean cd_rendering_caroussel_update_dock (gpointer pUserData, CairoContainer *pContainer, gboolean *bContinueAnimation)
 
372
gboolean cd_rendering_caroussel_update_dock (gpointer pUserData, GldiContainer *pContainer, gboolean *bContinueAnimation)
373
373
{
374
374
        if (! CAIRO_DOCK_IS_DOCK (pContainer))
375
 
                return CAIRO_DOCK_LET_PASS_NOTIFICATION;
 
375
                return GLDI_NOTIFICATION_LET_PASS;
376
376
        CairoDock *pDock = CAIRO_DOCK (pContainer);
377
377
        if (pDock->pRenderer->calculate_icons != cd_rendering_calculate_icons_caroussel)
378
 
                return CAIRO_DOCK_LET_PASS_NOTIFICATION;
 
378
                return GLDI_NOTIFICATION_LET_PASS;
379
379
        
380
380
        if (pDock->container.bInside)
381
381
        {
398
398
                _scroll_dock_icons (pDock, iScrollAmount);  // avec un scroll de 0, cela termine le scroll.
399
399
                *bContinueAnimation |= (pDock->iScrollOffset != 0);
400
400
        }
401
 
        return CAIRO_DOCK_LET_PASS_NOTIFICATION;
 
401
        return GLDI_NOTIFICATION_LET_PASS;
402
402
}