← Back to branch summary

~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/3.0.0.0rc1

« back to all changes in this revision

Viewing changes to compiz-icon/src/applet-notifications.c

  • Committer: Bazaar Package Importer
  • Author(s): Julien Lavergne, Matthieu Baerts (matttbe), Julien Lavergne
  • Date: 2009-10-05 19:27:17 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20091005192717-mvqvb395guktr401
Tags: 2.0.9-0ubuntu1
https://launchpad.net/bugs/435590
[ Matthieu Baerts (matttbe) ]
* New upstream release (LP: #435590)
* debian/control: 
 - Remove ${shlibs:Depends} for integration plug-ins to avoid
   pulling shared libraries which are detected automatically.
 - Added curl as depends for cairo-dock-plug-ins
* debian/rules:
 - Add --enable-dnd2share and --enable-musicplayer to enable new applets.
 - Remove --enable-rhythmbox and --enable-nvidia to remove those applets,
   not maintained upstream.
* Update *.install to take all generated applets.

[ Julien Lavergne ]
* Adjust changelog with Daniel Holbach suggestions.
* cairo-dock-plug-ins.changelogs:  Install specific changelog for 2.0.9
* Build-depends on cairo-dock-dev (>= 2.0.9)

Show diffs side-by-side

added added

removed removed

Lines of Context:
compiz-icon/src/applet-notifications.c
17
17
* along with this program.  If not, see <http://www.gnu.org/licenses/>.
18
18
*/
19
19
 
20
 
/******************************************************************************
21
 
 
22
 
This file is a part of the cairo-dock program, 
23
 
released under the terms of the GNU General Public License.
24
 
 
25
 
Written by Rémy Robertson (for any bug report, please mail me to changfu@cairo-dock.org)
26
 
Fabrice Rey <fabounet@users.berlios.de>
27
 
 
28
 
******************************************************************************/
29
 
 
30
20
#define _BSD_SOURCE
31
21
#include <stdlib.h>
32
22
#include <stdio.h>
153
143
}
154
144
CD_APPLET_ON_CLICK_BEGIN
155
145
        if (myDock != NULL && myIcon->pSubDock != NULL && pClickedContainer == CAIRO_CONTAINER (myIcon->pSubDock) && pClickedIcon != NULL) {  // clic sur ne icone du sous-dock.
156
 
                //cd_debug (" clic sur %s", pClickedIcon->acName);
157
 
                ///if (pClickedIcon->acCommand != NULL && strcmp (pClickedIcon->acCommand, "none") != 0)
 
146
                //cd_debug (" clic sur %s", pClickedIcon->cName);
 
147
                ///if (pClickedIcon->cCommand != NULL && strcmp (pClickedIcon->cCommand, "none") != 0)
158
148
                ///     return CAIRO_DOCK_LET_PASS_NOTIFICATION;
159
149
                _compiz_action_by_id ((int) pClickedIcon->fOrder/2, pClickedIcon);
160
150
        }
162
152
                if (pClickedIcon == myIcon)
163
153
                        cairo_dock_launch_task (myData.pTask);
164
154
                else {
165
 
                        if (pClickedIcon->acCommand != NULL && strcmp (pClickedIcon->acCommand, "none") != 0)
 
155
                        if (pClickedIcon->cCommand != NULL && strcmp (pClickedIcon->cCommand, "none") != 0)
166
156
                                return CAIRO_DOCK_LET_PASS_NOTIFICATION;
167
157
                        _compiz_action_by_id ((int) pClickedIcon->fOrder/2, pClickedIcon);
168
158
                }
176
166
        if (pClickedIcon == myIcon) {
177
167
                _action_on_click (myConfig.iActionOnMiddleClick);
178
168
        }
179
 
        else if (pClickedIcon != NULL && pClickedIcon->acCommand != NULL && strcmp (pClickedIcon->acCommand, "none") != 0)
 
169
        else if (pClickedIcon != NULL && pClickedIcon->cCommand != NULL && strcmp (pClickedIcon->cCommand, "none") != 0)
180
170
                return CAIRO_DOCK_LET_PASS_NOTIFICATION;
181
171
CD_APPLET_ON_MIDDLE_CLICK_END
182
172
 
186
176
        cd_compiz_start_decorator (iDecorator);
187
177
}
188
178
CD_APPLET_ON_BUILD_MENU_BEGIN
189
 
        if (CD_APPLET_CLICKED_ICON != NULL && strcmp(CD_APPLET_CLICKED_ICON->acName,D_("Emerald Manager")) == 0) {
 
179
        if (CD_APPLET_CLICKED_ICON != NULL && strcmp(CD_APPLET_CLICKED_ICON->cName,D_("Emerald Manager")) == 0) {
190
180
                CD_APPLET_ADD_IN_MENU (D_("Reload Emerald"), cd_compiz_start_favorite_decorator, CD_APPLET_MY_MENU);
191
181
        }
192
182
        
206
196
        }
207
197
        CD_APPLET_ADD_IN_MENU (D_("Toggle Show Desktop"), _compiz_menu_show_desktop, pSubMenu);
208
198
        CD_APPLET_ADD_ABOUT_IN_MENU (pSubMenu);
209
 
        if (pClickedIcon != myIcon && (pClickedIcon == NULL || pClickedIcon->acCommand == NULL || strcmp (pClickedIcon->acCommand, "none") == 0 || ! CAIRO_DOCK_IS_APPLI (pClickedIcon)))
 
199
        if (pClickedIcon != myIcon && (pClickedIcon == NULL || pClickedIcon->cCommand == NULL || strcmp (pClickedIcon->cCommand, "none") == 0 || ! CAIRO_DOCK_IS_APPLI (pClickedIcon)))
210
200
                return CAIRO_DOCK_INTERCEPT_NOTIFICATION;  // on ne veut pas des autres entrees habituelles du menu.
211
201
CD_APPLET_ON_BUILD_MENU_END