3227
|
1 |
--- cairo-dock-plugins-2.2.0-4/GMenu/src/applet-run-dialog.c 2010-10-02 00:42:14.000000000 +0200
|
|
2 |
+++ cairo-dock-plugins-2.2.0-4-patch/GMenu/src/applet-run-dialog.c 2011-02-20 17:02:37.663012082 +0100
|
|
3 |
@@ -62,11 +62,7 @@
|
|
4 |
|
|
5 |
suffix = NULL;
|
|
6 |
if (
|
|
7 |
- /* don't use g_file_test at first so we don't stat() */
|
|
8 |
- dent->d_type == DT_DIR ||
|
|
9 |
- (dent->d_type == DT_LNK &&
|
|
10 |
- g_file_test (file, G_FILE_TEST_IS_DIR))
|
|
11 |
- //g_file_test (file, G_FILE_TEST_IS_DIR)
|
|
12 |
+ g_file_test (file, G_FILE_TEST_IS_DIR)
|
|
13 |
)
|
|
14 |
suffix = "/";
|
|
15 |
|
|
16 |
--- cairo-dock-plugins-2.2.0-4/mail/src/CMakeLists.txt 2010-10-02 00:42:12.000000000 +0200
|
|
17 |
+++ cairo-dock-plugins-2.2.0-4-patch/mail/src/CMakeLists.txt 2011-02-20 17:07:51.319858503 +0100
|
|
18 |
@@ -18,7 +18,7 @@
|
|
19 |
add_library(${PACKAGE_MAIL} SHARED ${cd-mail_LIB_SRCS})
|
|
20 |
|
|
21 |
########### compil ###############
|
|
22 |
-add_definitions (-D_POSIX_SOURCE=1 -DHAVE_SSL_SUPPORT=1)
|
|
23 |
+add_definitions (-D_XOPEN_SOURCE=600 -DHAVE_SSL_SUPPORT=1)
|
|
24 |
add_definitions (-DMY_APPLET_SHARE_DATA_DIR="${maildatadir}")
|
|
25 |
add_definitions (-DMY_APPLET_PREVIEW_FILE="preview.jpg")
|
|
26 |
add_definitions (-DMY_APPLET_CONF_FILE="mail.conf")
|
3605
|
27 |
--- cairo-dock-plugins-2.3.0~3/shortcuts/src/applet-disk-usage.c Sun Jun 19 01:27:28 2011
|
|
28 |
+++ applet-disk-usage.c Wed Jul 13 21:51:53 2011
|
3227
|
29 |
@@ -17,11 +17,12 @@
|
|
30 |
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
31 |
*/
|
|
32 |
|
|
33 |
+#include <stdio.h>
|
|
34 |
#include <string.h>
|
|
35 |
-#include <mntent.h>
|
|
36 |
#include <sys/types.h>
|
|
37 |
-#include <sys/statfs.h>
|
|
38 |
-#include <mntent.h>
|
|
39 |
+#include <sys/statvfs.h>
|
|
40 |
+#include <sys/mntent.h>
|
|
41 |
+#include <sys/mnttab.h>
|
|
42 |
#include <math.h>
|
|
43 |
|
|
44 |
#include <cairo-dock.h>
|
3605
|
45 |
@@ -32,13 +33,11 @@
|
3227
|
46 |
|
|
47 |
void cd_shortcuts_get_fs_stat (const gchar *cDiskURI, CDDiskUsage *pDiskUsage)
|
|
48 |
{
|
|
49 |
- static struct statfs sts;
|
|
50 |
+ static struct statvfs sts;
|
|
51 |
const gchar *cMountPath = (strncmp (cDiskURI, "file://", 7) == 0 ? cDiskURI + 7 : cDiskURI);
|
|
52 |
|
|
53 |
- if (statfs (cMountPath, &sts) == 0)
|
|
54 |
+ if (statvfs (cMountPath, &sts) == 0)
|
|
55 |
{
|
|
56 |
- if (pDiskUsage->iType == 0)
|
|
57 |
- pDiskUsage->iType = sts.f_type;
|
|
58 |
pDiskUsage->iAvail = (long long)sts.f_bavail * sts.f_bsize; // Blocs libres pour utilisateurs
|
|
59 |
pDiskUsage->iFree = (long long)sts.f_bfree * sts.f_bsize; // Blocs libres
|
|
60 |
pDiskUsage->iTotal = (long long)sts.f_blocks * sts.f_bsize; // Nombre total de blocs
|
3605
|
61 |
@@ -153,8 +152,8 @@
|
3227
|
62 |
static void _cd_shortcuts_get_fs_info (const gchar *cDiskURI, GString *sInfo)
|
|
63 |
{
|
|
64 |
const gchar *cMountPath = (strncmp (cDiskURI, "file://", 7) == 0 ? cDiskURI + 7 : cDiskURI);
|
|
65 |
- struct mntent *me;
|
|
66 |
- FILE *mtab = setmntent ("/etc/mtab", "r");
|
|
67 |
+ struct mnttab *me;
|
|
68 |
+ FILE *mtab = fopen ("/etc/mnttab", "r");
|
|
69 |
char *search_path;
|
|
70 |
int match;
|
|
71 |
char *slash;
|
3605
|
72 |
@@ -166,22 +165,20 @@
|
3227
|
73 |
}
|
|
74 |
|
|
75 |
gchar *cFsInfo = NULL;
|
|
76 |
- while ((me = getmntent (mtab)) != NULL)
|
|
77 |
+ while (getmntent (mtab, me) == 0)
|
|
78 |
{
|
|
79 |
- if (me->mnt_dir && strcmp (me->mnt_dir, cMountPath) == 0)
|
|
80 |
+ if (me->mnt_mountp && strcmp (me->mnt_mountp, cMountPath) == 0)
|
|
81 |
{
|
|
82 |
g_string_append_printf (sInfo, "Mount point : %s\nFile system : %s\nDevice : %s\nMount options : %s",
|
|
83 |
- me->mnt_dir,
|
|
84 |
- me->mnt_type,
|
|
85 |
- me->mnt_fsname,
|
|
86 |
- me->mnt_opts);
|
|
87 |
- if (me->mnt_freq != 0)
|
|
88 |
- g_string_append_printf (sInfo, "\nBackup frequency : %d days", me->mnt_freq);
|
|
89 |
+ me->mnt_mountp,
|
|
90 |
+ me->mnt_fstype,
|
|
91 |
+ me->mnt_special,
|
|
92 |
+ me->mnt_mntopts);
|
|
93 |
break ;
|
|
94 |
}
|
|
95 |
}
|
|
96 |
|
|
97 |
- endmntent (mtab);
|
|
98 |
+ fclose (mtab);
|
|
99 |
}
|
|
100 |
|
|
101 |
gchar *cd_shortcuts_get_disk_info (const gchar *cDiskURI, const gchar *cDiskName)
|