← Back to branch summary

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

« back to all changes in this revision

Viewing changes to Indicator-Generic/src/applet-init.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:
Indicator-Generic/src/applet-init.c
60
60
 
61
61
                cd_indicator_generic_add_monitor_dir (myApplet);
62
62
 
63
 
                GDir *pDir = cd_indicator_generic_open_dir (myApplet);
64
 
                if (pDir == NULL || cd_indicator_generic_load_all_indicators (myApplet, pDir) == 0)
65
 
                        myApplet->pModule->pVisitCard->iContainerType = CAIRO_DOCK_MODULE_IS_PLUGIN; // dir is empty... no need to create an icon
 
63
                GDir *pDirModules = cd_indicator_generic_open_dir_modules (myApplet);
 
64
                GDir *pDirServices = cd_indicator_generic_open_dir_sevices (myApplet);
 
65
                if ((pDirModules == NULL && pDirServices == NULL)
 
66
                        || cd_indicator_generic_load_all_indicators (myApplet, pDirModules, pDirServices) == 0)
 
67
                        myApplet->pModule->pVisitCard->iContainerType = CAIRO_DOCK_MODULE_IS_PLUGIN; // dir are empty... no need to create an icon
66
68
        }
67
69
        else
68
70
        {