← Back to branch summary

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

« back to all changes in this revision

Viewing changes to icon-effect/src/applet-init.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2010-08-10 00:05:57 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20100810000557-pfxoz5w7hbyclcqh
Tags: 2.2.0~0beta4-0ubuntu1
https://launchpad.net/bugs/614625
https://launchpad.net/bugs/483963
https://launchpad.net/bugs/485159
https://launchpad.net/bugs/500677
https://launchpad.net/bugs/500979
https://launchpad.net/bugs/521531
https://launchpad.net/bugs/519915
https://launchpad.net/bugs/526138
https://launchpad.net/bugs/531317
https://launchpad.net/bugs/531319
https://launchpad.net/bugs/537115
https://launchpad.net/bugs/537943
https://launchpad.net/bugs/538637
* New Upstream Version (LP: #614625)
* Fixed a few bugs on LP:
 - LP: #483963: Dustbin applet does not display trashes on all volumes
 - LP: #485159: Some apps have problem with Systray
 - LP: #500677: ~/.xsession-errors is too much used by CD
 - LP: #500979: Shortcuts: the order gets messed up
 - LP: #521531: Mail: crashes on Maildir
 - LP: #519915: GTG: create a new applet to control GTG
 - LP: #526138: GMenu doesn't handle desktop file exec strings properly
 - LP: #531317: CMake: Added an error if the prefix of 'cairo-dock-plugins'
                 is not the same 'cairo-dock-core'
 - LP: #531319: CMake: check the version of 'cairo-dock' when building
                 'cairo-dock-plugins'
 - LP: #537115: Click at the position where icon lavel was, the icon
                 and dock still receive the event
 - LP: #537943: Terminal applet shortkey behaviour
 - LP: #538637: Trash applet doesn't create .trashinfo files on XFCE
 - More details on the 'ChangeLog' file
* debian/rules:
 - Autotools has been replaced by CMake
 - cdbs is now used.
* debian/copyright:
 - Updated with the new applets
* debian/control:
 - Autotools has been replaced by CMake
 - Added libcurl4-gnutls-dev, libindicator-dev, libdbusmenu-glib-dev
   libido-0.1-dev, libical-dev, libdbusmenu-gtk-dev as Build-deps
 - Bump Standard-Version to 3.9.1
 - Wget is required for dnd2share applet
 - Added the exact realease for 'cairo-dock-dev' in order to prevent any
    build error if this package is not already available (thx to didrocks)
* debian/cairo-dock-plug-ins*.install:
 - All sonames are now installed into lib32 or lib64 (lib*)

Show diffs side-by-side

added added

removed removed

Lines of Context:
icon-effect/src/applet-init.c
30
30
#include "applet-firework.h"
31
31
#include "applet-init.h"
32
32
 
33
 
#define _register_effect(i, name, disp_name) do {\
34
 
        cd_icon_effect_register_fire (&myData.pEffects[CD_ICON_EFFECT_FIRE]);\
35
 
        myData.iAnimationID[CD_ICON_EFFECT_FIRE] = cairo_dock_register_animation (name, disp_name);\
36
 
        myData.pEffects[CD_ICON_EFFECT_FIRE].iDuration = myConfig.iFireDuration;\
37
 
        myData.pEffects[CD_ICON_EFFECT_FIRE].bRepeat = myConfig.bContinueFire; } while (0)
38
 
        
39
33
 
40
 
CD_APPLET_PRE_INIT_BEGIN (N_("icon effects"),
 
34
CD_APPLET_DEFINE_BEGIN (N_("icon effects"),
41
35
        2, 0, 0,
42
36
        CAIRO_DOCK_CATEGORY_THEME,
43
 
        N_("This plug-in adds many special effects to your icons."),
 
37
        N_("This plugin adds many special effects to your icons."),
44
38
        "Fabounet (Fabrice Rey)")
45
39
        if (! g_bUseOpenGL)
46
40
                return FALSE;
47
 
        CD_APPLET_DEFINE_COMMON_APPLET_INTERFACE
48
 
CD_APPLET_PRE_INIT_END
 
41
        CD_APPLET_DEFINE_COMMON_APPLET_INTERFACE;
 
42
        CD_APPLET_SET_CONTAINER_TYPE (CAIRO_DOCK_MODULE_IS_PLUGIN);
 
43
CD_APPLET_DEFINE_END
49
44
 
50
45
static inline void _set_effects_duration (void)
51
46
{
82
77
        cairo_dock_register_notification (CAIRO_DOCK_STOP_ICON, (CairoDockNotificationFunc) cd_icon_effect_free_data, CAIRO_DOCK_RUN_AFTER, NULL);
83
78
        
84
79
        cd_icon_effect_register_fire (&myData.pEffects[CD_ICON_EFFECT_FIRE]);
85
 
        myData.iAnimationID[CD_ICON_EFFECT_FIRE] = cairo_dock_register_animation ("fire", D_("Fire"));
 
80
        myData.iAnimationID[CD_ICON_EFFECT_FIRE] = cairo_dock_register_animation ("fire", D_("Fire"), TRUE);
86
81
        
87
82
        cd_icon_effect_register_stars (&myData.pEffects[CD_ICON_EFFECT_STARS]);
88
 
        myData.iAnimationID[CD_ICON_EFFECT_STARS] = cairo_dock_register_animation ("stars", D_("Stars"));
 
83
        myData.iAnimationID[CD_ICON_EFFECT_STARS] = cairo_dock_register_animation ("stars", D_("Stars"), TRUE);
89
84
        
90
85
        cd_icon_effect_register_rain (&myData.pEffects[CD_ICON_EFFECT_RAIN]);
91
 
        myData.iAnimationID[CD_ICON_EFFECT_RAIN] = cairo_dock_register_animation ("rain", D_("Rain"));
 
86
        myData.iAnimationID[CD_ICON_EFFECT_RAIN] = cairo_dock_register_animation ("rain", D_("Rain"), TRUE);
92
87
        
93
88
        cd_icon_effect_register_snow (&myData.pEffects[CD_ICON_EFFECT_SNOW]);
94
 
        myData.iAnimationID[CD_ICON_EFFECT_SNOW] = cairo_dock_register_animation ("snow", D_("Snow"));
 
89
        myData.iAnimationID[CD_ICON_EFFECT_SNOW] = cairo_dock_register_animation ("snow", D_("Snow"), TRUE);
95
90
        
96
91
        cd_icon_effect_register_storm (&myData.pEffects[CD_ICON_EFFECT_SAND]);
97
 
        myData.iAnimationID[CD_ICON_EFFECT_SAND] = cairo_dock_register_animation ("storm", D_("Storm"));
 
92
        myData.iAnimationID[CD_ICON_EFFECT_SAND] = cairo_dock_register_animation ("storm", D_("Storm"), TRUE);
98
93
        
99
94
        cd_icon_effect_register_firework (&myData.pEffects[CD_ICON_EFFECT_FIREWORK]);
100
 
        myData.iAnimationID[CD_ICON_EFFECT_FIREWORK] = cairo_dock_register_animation ("firework", D_("Firework"));
 
95
        myData.iAnimationID[CD_ICON_EFFECT_FIREWORK] = cairo_dock_register_animation ("firework", D_("Firework"), TRUE);
101
96
        
102
97
        _set_effects_duration ();
103
98
        
140
135
        {
141
136
                if (pEffectList[i] == iEffect)
142
137
                        return TRUE;
143
 
                else if (myConfig.iEffectsUsed[i] >= CD_ICON_EFFECT_NB_EFFECTS)  // uint
 
138
                else if (myConfig.iEffectsUsed[i] >= CD_ICON_EFFECT_NB_EFFECTS)
144
139
                        break ;
145
140
        }
146
141
        return FALSE;