← Back to branch summary

~cairo-dock-team/ubuntu/oneiric/cairo-dock-plug-ins/2.3.0-2.1

« back to all changes in this revision

Viewing changes to Remote-Control/src/applet-icon-finder.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2011-04-20 20:46:51 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20110420204651-ftnpzesj6uc7qeul
Tags: 2.3.0~1-0ubuntu1
https://launchpad.net/bugs/723995
* New Upstream Version (LP: #723995)
* Upstream short ChangeLog (since 2.3.0~0rc1):
 - Updated translations
 - Updated the integration of the new versions of kwin and compiz
    (Switcher, ShowDesktop, etc.)
 - Removed a lot of useless g_print
 - Updated a few plug-ins to fit with the new version of the API (gldit)
 - Fixed a few bugs
 - Updated MeMenu, MessagingMenu and Status-Notifier to works
    with the latest version of dbusmenu, etc.
* Switch to dpkg-source 3.0 (quilt) format
* debian/cairo-dock-plug-ins.install:
 - Added new files (interfaces for python, ruby, vala and mono)
* debian/control:
 - Added new dependences for new applets (sensors and zeitgeist)
    and new interfaces (python, valac, ruby and mono)
 - Updated the version of cairo-dock build-dependences
* debian/rules:
 - Added a new CMake flag to install python interface in debian/tmp
* Updated debian/watch

Show diffs side-by-side

added added

removed removed

Lines of Context:
Remote-Control/src/applet-icon-finder.c
148
148
        if (myData.pCurrentDock != NULL && pDock != myData.pCurrentDock)  // on remet au repos le dock precedemment anime.
149
149
        {
150
150
                cairo_dock_emit_leave_signal (CAIRO_CONTAINER (myData.pCurrentDock));
151
 
                cairo_dock_remove_notification_func_on_container (CAIRO_CONTAINER (myData.pCurrentDock), CAIRO_DOCK_RENDER_DOCK, (CairoDockNotificationFunc) cd_do_render, NULL);
152
 
                cairo_dock_remove_notification_func_on_container (CAIRO_CONTAINER (myData.pCurrentDock), CAIRO_DOCK_UPDATE_DOCK, (CairoDockNotificationFunc) cd_do_update_container, NULL);
 
151
                cairo_dock_remove_notification_func_on_object (myData.pCurrentDock, NOTIFICATION_RENDER_DOCK, (CairoDockNotificationFunc) cd_do_render, NULL);
 
152
                cairo_dock_remove_notification_func_on_object (myData.pCurrentDock, NOTIFICATION_UPDATE_DOCK, (CairoDockNotificationFunc) cd_do_update_container, NULL);
153
153
        }
154
154
        if (pDock != NULL && pDock != myData.pCurrentDock)  // on montre le nouveau dock
155
155
        {
175
175
                        cairo_dock_emit_enter_signal (CAIRO_CONTAINER (pDock));
176
176
                }
177
177
                
178
 
                cairo_dock_register_notification_on_container (CAIRO_CONTAINER (pDock),
179
 
                        CAIRO_DOCK_UPDATE_DOCK,
 
178
                cairo_dock_register_notification_on_object (pDock,
 
179
                        NOTIFICATION_UPDATE_DOCK,
180
180
                        (CairoDockNotificationFunc) cd_do_update_container,
181
181
                        CAIRO_DOCK_RUN_AFTER, NULL);
182
 
                cairo_dock_register_notification_on_container (CAIRO_CONTAINER (pDock),
183
 
                        CAIRO_DOCK_RENDER_DOCK,
 
182
                cairo_dock_register_notification_on_object (pDock,
 
183
                        NOTIFICATION_RENDER_DOCK,
184
184
                        (CairoDockNotificationFunc) cd_do_render,
185
185
                        CAIRO_DOCK_RUN_AFTER, NULL);
186
186
        }