← Back to branch summary

~ubuntu-branches/ubuntu/maverick/cairo-dock-plug-ins/maverick-201105201137

« back to all changes in this revision

Viewing changes to dustbin/src/applet-trashes-manager.c

  • Committer: matttbe
  • Date: 2010-09-07 00:39:20 UTC
  • Revision ID: matttbe@gmail.com-20100907003920-jb7hpit570zdaf44
https://launchpad.net/bugs/582452
https://launchpad.net/bugs/604034
https://launchpad.net/bugs/616176
https://launchpad.net/bugs/632054
* New Upstream Version (LP: #632054)
* Fixed a few bugs on LP:
 - LP: #616176 Dust Bin Hang and Incorrect Configuration
 - LP: #604034 Change terminal tab's name lost the color
 - LP: #582452 GMenu does not contain any applications
* Fixed a few bugs on glx-dock forum:
 - Fixed support of GMusicBrowser.
 - AlsaMixer has no emblem.
 - Status-Notifier doesn't be drawed into the dock.
* Updated translations
* debian/control:
 - Added cairo-dock-core as build-depends in order to prevent
   some builds errors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dustbin/src/applet-trashes-manager.c
35
35
static gboolean cd_dustbin_display_result (CairoDockModuleInstance *myApplet)
36
36
{
37
37
        myData.iMeasure = myData._iMeasure;
38
 
        g_print ("trash measure : %d\n", myData.iMeasure);
 
38
        //g_print ("trash measure : %d\n", myData.iMeasure);
39
39
        
40
40
        if (myData.iMeasure == 0)
41
41
        {
66
66
                {
67
67
                        CD_APPLET_SET_SIZE_AS_QUICK_INFO (myData.iMeasure);
68
68
                }
 
69
                else  // on vire les "..."
 
70
                {
 
71
                        CD_APPLET_SET_QUICK_INFO_ON_MY_ICON (NULL);
 
72
                }
69
73
        }
70
74
        
71
75
        CD_APPLET_REDRAW_MY_ICON;
75
79
static void cd_dustbin_on_file_event (CairoDockFMEventType iEventType, const gchar *cURI, CairoDockModuleInstance *myApplet)
76
80
{
77
81
        g_return_if_fail (cURI != NULL);
78
 
        g_print ("%s (%s, %d)\n", __func__, cURI, myData.iMeasure);
 
82
        //g_print ("%s (%s, %d)\n", __func__, cURI, myData.iMeasure);
79
83
        gchar *cQuickInfo = NULL;
80
84
        switch (iEventType)
81
85
        {
83
87
                case CAIRO_DOCK_FILE_CREATED :
84
88
                        if (cairo_dock_task_is_running (myData.pTask) || cairo_dock_task_is_active (myData.pTask))
85
89
                        {
86
 
                                g_print ("cancel measure\n");
 
90
                                //g_print ("cancel measure\n");
87
91
                                cairo_dock_discard_task (myData.pTask);
88
92
                                myData.pTask = cairo_dock_new_task (0,
89
93
                                        (CairoDockGetDataAsyncFunc) cd_dustbin_measure_trash,
90
94
                                        (CairoDockUpdateSyncFunc) cd_dustbin_display_result,
91
95
                                        myApplet);
92
96
                        }
93
 
                        else
 
97
                        else if (myConfig.iQuickInfoType == CD_DUSTBIN_INFO_WEIGHT || myConfig.iQuickInfoType == CD_DUSTBIN_INFO_NB_FILES)
94
98
                                CD_APPLET_SET_QUICK_INFO_ON_MY_ICON_PRINTF ("%s...", (myDesklet ? D_("calculating") : ""));
95
99
                        cairo_dock_launch_task_delayed (myData.pTask, 500);
96
100
                break ;
139
143
        {
140
144
                cairo_dock_fm_remove_monitor_full (myData.cDustbinPath, TRUE, NULL);
141
145
        }
 
146
        
 
147
        cairo_dock_dialog_unreference (myData.pInfoDialog);
 
148
        
 
149
        cairo_dock_free_task (myData.pInfoTask);
 
150
        myData.pInfoTask = NULL;
142
151
}