← Back to branch summary

~ubuntu-branches/ubuntu/quantal/cairo-dock-plug-ins/quantal-201208191523

« back to all changes in this revision

Viewing changes to Remote-Control/src/applet-notifications.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-notifications.c
160
160
                                myData.bIgnoreIconState = TRUE;
161
161
                                cairo_dock_stop_icon_animation (myData.pCurrentIcon);  // car aucune animation ne va la remplacer.
162
162
                                myData.bIgnoreIconState = FALSE;
163
 
                                cairo_dock_notify (CAIRO_DOCK_MIDDLE_CLICK_ICON, myData.pCurrentIcon, myData.pCurrentDock);
 
163
                                cairo_dock_notify_on_object (&myContainersMgr, NOTIFICATION_MIDDLE_CLICK_ICON, myData.pCurrentIcon, myData.pCurrentDock);
 
164
                                cairo_dock_notify_on_object (CAIRO_CONTAINER (myData.pCurrentDock), NOTIFICATION_MIDDLE_CLICK_ICON, myData.pCurrentIcon, myData.pCurrentDock);
164
165
                        }
165
166
                        else if (iModifierType & GDK_CONTROL_MASK)  // CTRL
166
167
                        {
172
173
                                GtkWidget *menu = cairo_dock_build_menu (myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock));
173
174
                                cairo_dock_popup_menu_on_icon (menu, myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock));
174
175
                        }
175
 
                        else if (myData.pCurrentIcon != NULL)
 
176
                        else
176
177
                        {
177
 
                                cairo_dock_notify (CAIRO_DOCK_CLICK_ICON, myData.pCurrentIcon, myData.pCurrentDock, iModifierType);
 
178
                                cairo_dock_notify_on_object (&myContainersMgr, NOTIFICATION_CLICK_ICON, myData.pCurrentIcon, myData.pCurrentDock, iModifierType);
 
179
                                cairo_dock_notify_on_object (CAIRO_CONTAINER (myData.pCurrentDock), NOTIFICATION_CLICK_ICON, myData.pCurrentIcon, myData.pCurrentDock, iModifierType);
178
180
                                if (CAIRO_DOCK_IS_APPLI (myData.pCurrentIcon))
179
181
                                        myData.iPreviouslyActiveWindow = 0;
180
182
                        }
181
 
                        if (myData.pCurrentIcon != NULL)
182
 
                                cairo_dock_start_icon_animation (myData.pCurrentIcon, myData.pCurrentDock);
 
183
                        cairo_dock_start_icon_animation (myData.pCurrentIcon, myData.pCurrentDock);
183
184
                        myData.bIgnoreIconState = FALSE;
184
185
                        myData.pCurrentIcon = NULL;  // sinon on va interrompre l'animation en fermant la session.
185
186
                }
219
220
                                if (n > 0)
220
221
                                {
221
222
                                        myData.pCurrentIcon =  g_list_nth_data (g_pMainDock->icons, (n-1) / 2);
222
 
                                        if (CAIRO_DOCK_IS_SEPARATOR (myData.pCurrentIcon) && n > 1)
 
223
                                        if (CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (myData.pCurrentIcon) && n > 1)
223
224
                                                myData.pCurrentIcon = g_list_nth_data (g_pMainDock->icons, (n+1) / 2);
224
225
                                }
225
226
                        }
226
227
                        if (myData.pCurrentDock->icons != NULL)
227
228
                        {
228
229
                                Icon *pPrevIcon = cairo_dock_get_previous_icon (myData.pCurrentDock->icons, myData.pCurrentIcon);
229
 
                                if (CAIRO_DOCK_IS_SEPARATOR (pPrevIcon))
 
230
                                if (CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (pPrevIcon))
230
231
                                        pPrevIcon = cairo_dock_get_previous_icon (myData.pCurrentDock->icons, pPrevIcon);
231
232
                                if (pPrevIcon == NULL)  // pas trouve ou bien 1ere icone.
232
233
                                {
246
247
                                if (n > 0)
247
248
                                {
248
249
                                        myData.pCurrentIcon =  g_list_nth_data (g_pMainDock->icons, (n-1) / 2);
249
 
                                        if (CAIRO_DOCK_IS_SEPARATOR (myData.pCurrentIcon) && n > 1)
 
250
                                        if (CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (myData.pCurrentIcon) && n > 1)
250
251
                                                myData.pCurrentIcon = g_list_nth_data (g_pMainDock->icons, (n+1) / 2);
251
252
                                }
252
253
                        }
253
254
                        if (myData.pCurrentDock->icons != NULL)
254
255
                        {
255
256
                                Icon *pNextIcon = cairo_dock_get_next_icon (myData.pCurrentDock->icons, myData.pCurrentIcon);
256
 
                                if (CAIRO_DOCK_IS_SEPARATOR (pNextIcon))
 
257
                                if (CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (pNextIcon))
257
258
                                        pNextIcon = cairo_dock_get_next_icon (myData.pCurrentDock->icons, pNextIcon);
258
259
                                if (pNextIcon == NULL)  // pas trouve ou bien 1ere icone.
259
260
                                {
281
282
                                if (n > 0)
282
283
                                {
283
284
                                        pNextIcon =  g_list_nth_data (pNextDock->icons, (n-1) / 2);
284
 
                                        if (CAIRO_DOCK_IS_SEPARATOR (pNextIcon) && n > 1)
 
285
                                        if (CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (pNextIcon) && n > 1)
285
286
                                                pNextIcon = g_list_nth_data (pNextDock->icons, (n+1) / 2);
286
287
                                }
287
288
                                cd_do_change_current_icon (pNextIcon, pNextDock);