[Xfce4-commits] r24681 - xfdesktop/trunk
Author: kelnos Date: 2007-01-21 11:51:12 + (Sun, 21 Jan 2007) New Revision: 24681 Modified: xfdesktop/trunk/NEWS Log: update NEWS for 4.4.0 Modified: xfdesktop/trunk/NEWS === --- xfdesktop/trunk/NEWS2007-01-20 21:18:19 UTC (rev 24680) +++ xfdesktop/trunk/NEWS2007-01-21 11:51:12 UTC (rev 24681) @@ -1,3 +1,84 @@ +20070121 (Xfce 4.4.0): +-- + +We're just about ready to release Xfce 4.4.0! Hooray! There have been +many changes since my last entry. + +Change since 4.4rc2: + + * Fix support for applications that do pseudo-transparency (bug 2508). + * Change how icon cell size is calculated to avoid weirdness at large +sizes (bug 1546). + * Fix icons disappearing when the icon/text size is set too large, and +then not reappearing when the size is lowered again (bug 1546). + * Add hidden options to disable showing any or all of the 'File System', +'Home', or 'Trash' icons. + * Partially fix backdrop setting problems when unsetting Xinerama +stretch mode (bug 2573). + * Fix some possible (but unliklely) NULL pointer dereferences. + * Update documentation. + +Changes since 4.4rc1: + + * Fix crash when non-file:// URIs are dropped on the desktop (bug 2229). + * Handle Xinerama-enabled setups correctly so icons aren't placed in +dead areas or on the boundary between monitors (bug 1538). + * Fix crash when reloading the desktop several times quickly (bug 2426). + * Trash files by default, add binding for shift+delete to force +deletion (bug 2185). + * Fix crash when screen size changes (bug 2457). + * Fix problems with activating icons (bug 2452, 2206). + * Allow the icons to provide better information about what drag/drop +actions are allowed, so user feedback about drags/drops is much +better. + * Fix broken drop of multiple files onto the desktop (bug 2437). + * Be sure to notice if a removable volume's mount point changes +(bug 2489). + * Fix 100% CPU problem when the desktop folder is deleted (bug 2160). + +Changes since 4.4beta2: + + * Fix backdrop image tearing during expose (bug 1944). + * Show icon tooltips where appropriate (bug 1526). + * Use thunarx extensions for the icon context menus and properties +dialogs. + * Fix ugly gradients in the desktop wallpaper on 16-bit displays +(bug 1819). + * Don't show a folder for the desktop directory itself (bug 1916). + * Fix problems with markup in text labels (bug 2082). + * Add 'File System', 'Home', and 'Trash' icons. + * Fix compositing emblems on icons (1875). + * Use native Pango ellipsising support for the windowlist menu, which +looks way better (bug 2127). + * Allow panel plugin's menu to be opened at the pointer position +(bug 2103). + * Don't allow cut or delete if the file/dir isn't writeable (buf 2081). + * Memory leak fixes (bug 1910). + * Put the icon context menu on the proper screen (bug 2351). + +Changes since 4.4beta1: + + * Attempt to create ~/Desktop/ if it doesn't exist (bug 1691). + * Fix non-ejectable media showing as ejectable. + * Fix removable media not appearing when its mount point has not yet +been created. + * Don't have the desktop automatically take focus when it's mapped. + * Fix crash when removable volume has no mount point (bug 1763). + * Add support for creating launchers and URL launchers. + * Allow changing transparency of the icon label text background. + * Many icon drawing performance improvements, and fixes for some +drawing glitches. + * Fix menu positioning for floating panels in the Xfce Menu panel +plugin (bug 1660). + * Have the 'log out' dialog pop up if the user 'closes' the desktop +window (bug 1776). + * Handle more thunar-vfs errors and prompts. + * Add XDirectSave support for dropping data on the desktop. + * Add support for dropping URLs from a browser on the desktop. + * Fix crash when mounting some removable volumes (bug 1897). + +(Brian) + 20060418 (Xfce 4.4beta1): - ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24682 - xfdesktop/trunk
Author: kelnos Date: 2007-01-21 11:53:28 + (Sun, 21 Jan 2007) New Revision: 24682 Modified: xfdesktop/trunk/ChangeLog Log: update cl Modified: xfdesktop/trunk/ChangeLog === --- xfdesktop/trunk/ChangeLog 2007-01-21 11:51:12 UTC (rev 24681) +++ xfdesktop/trunk/ChangeLog 2007-01-21 11:53:28 UTC (rev 24682) @@ -1,3 +1,41 @@ +2007-01-21 11:51 kelnos + + * xfdesktop/trunk/NEWS: update NEWS for 4.4.0 + +2007-01-20 21:17 benny + + * xfdesktop/trunk/INSTALL, xfdesktop/trunk/configure.ac.in, + xfdesktop/trunk/po/ar.po, xfdesktop/trunk/po/az.po, + xfdesktop/trunk/po/bg.po, xfdesktop/trunk/po/bn_IN.po, + xfdesktop/trunk/po/ca.po, xfdesktop/trunk/po/cs.po, + xfdesktop/trunk/po/de.po, xfdesktop/trunk/po/dz.po, + xfdesktop/trunk/po/el.po, xfdesktop/trunk/po/en_GB.po, + xfdesktop/trunk/po/eo.po, xfdesktop/trunk/po/es.po, + xfdesktop/trunk/po/es_MX.po, xfdesktop/trunk/po/et.po, + xfdesktop/trunk/po/eu.po, xfdesktop/trunk/po/fa.po, + xfdesktop/trunk/po/fi.po, xfdesktop/trunk/po/fr.po, + xfdesktop/trunk/po/gl.po, xfdesktop/trunk/po/gu.po, + xfdesktop/trunk/po/he.po, xfdesktop/trunk/po/hi.po, + xfdesktop/trunk/po/hu.po, xfdesktop/trunk/po/hy.po, + xfdesktop/trunk/po/it.po, xfdesktop/trunk/po/ja.po, + xfdesktop/trunk/po/ka.po, xfdesktop/trunk/po/ko.po, + xfdesktop/trunk/po/lt.po, xfdesktop/trunk/po/mk.po, + xfdesktop/trunk/po/mr.po, xfdesktop/trunk/po/ms.po, + xfdesktop/trunk/po/nb_NO.po, xfdesktop/trunk/po/nl.po, + xfdesktop/trunk/po/pa.po, xfdesktop/trunk/po/pl.po, + xfdesktop/trunk/po/pt_BR.po, xfdesktop/trunk/po/pt_PT.po, + xfdesktop/trunk/po/ro.po, xfdesktop/trunk/po/ru.po, + xfdesktop/trunk/po/sk.po, xfdesktop/trunk/po/sv.po, + xfdesktop/trunk/po/ta.po, xfdesktop/trunk/po/tr.po, + xfdesktop/trunk/po/uk.po, xfdesktop/trunk/po/vi.po, + xfdesktop/trunk/po/xfdesktop.pot, xfdesktop/trunk/po/zh_CN.po, + xfdesktop/trunk/po/zh_TW.po: Bump version. Update + Project-Id-Version. + +2007-01-20 13:18 kelnos + + * xfdesktop/trunk/ChangeLog: update cl + 2007-01-20 13:11 kelnos * xfdesktop/trunk/doc/C/xfdesktop.html, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24683 - xfdesktop/tags/xfce_4_4_0
Author: kelnos Date: 2007-01-21 11:53:44 + (Sun, 21 Jan 2007) New Revision: 24683 Modified: xfdesktop/tags/xfce_4_4_0/ChangeLog xfdesktop/tags/xfce_4_4_0/NEWS Log: retag 4.4.0 for NEWS/ChangeLog updates Modified: xfdesktop/tags/xfce_4_4_0/ChangeLog === --- xfdesktop/tags/xfce_4_4_0/ChangeLog 2007-01-21 11:53:28 UTC (rev 24682) +++ xfdesktop/tags/xfce_4_4_0/ChangeLog 2007-01-21 11:53:44 UTC (rev 24683) @@ -1,3 +1,41 @@ +2007-01-21 11:51 kelnos + + * xfdesktop/trunk/NEWS: update NEWS for 4.4.0 + +2007-01-20 21:17 benny + + * xfdesktop/trunk/INSTALL, xfdesktop/trunk/configure.ac.in, + xfdesktop/trunk/po/ar.po, xfdesktop/trunk/po/az.po, + xfdesktop/trunk/po/bg.po, xfdesktop/trunk/po/bn_IN.po, + xfdesktop/trunk/po/ca.po, xfdesktop/trunk/po/cs.po, + xfdesktop/trunk/po/de.po, xfdesktop/trunk/po/dz.po, + xfdesktop/trunk/po/el.po, xfdesktop/trunk/po/en_GB.po, + xfdesktop/trunk/po/eo.po, xfdesktop/trunk/po/es.po, + xfdesktop/trunk/po/es_MX.po, xfdesktop/trunk/po/et.po, + xfdesktop/trunk/po/eu.po, xfdesktop/trunk/po/fa.po, + xfdesktop/trunk/po/fi.po, xfdesktop/trunk/po/fr.po, + xfdesktop/trunk/po/gl.po, xfdesktop/trunk/po/gu.po, + xfdesktop/trunk/po/he.po, xfdesktop/trunk/po/hi.po, + xfdesktop/trunk/po/hu.po, xfdesktop/trunk/po/hy.po, + xfdesktop/trunk/po/it.po, xfdesktop/trunk/po/ja.po, + xfdesktop/trunk/po/ka.po, xfdesktop/trunk/po/ko.po, + xfdesktop/trunk/po/lt.po, xfdesktop/trunk/po/mk.po, + xfdesktop/trunk/po/mr.po, xfdesktop/trunk/po/ms.po, + xfdesktop/trunk/po/nb_NO.po, xfdesktop/trunk/po/nl.po, + xfdesktop/trunk/po/pa.po, xfdesktop/trunk/po/pl.po, + xfdesktop/trunk/po/pt_BR.po, xfdesktop/trunk/po/pt_PT.po, + xfdesktop/trunk/po/ro.po, xfdesktop/trunk/po/ru.po, + xfdesktop/trunk/po/sk.po, xfdesktop/trunk/po/sv.po, + xfdesktop/trunk/po/ta.po, xfdesktop/trunk/po/tr.po, + xfdesktop/trunk/po/uk.po, xfdesktop/trunk/po/vi.po, + xfdesktop/trunk/po/xfdesktop.pot, xfdesktop/trunk/po/zh_CN.po, + xfdesktop/trunk/po/zh_TW.po: Bump version. Update + Project-Id-Version. + +2007-01-20 13:18 kelnos + + * xfdesktop/trunk/ChangeLog: update cl + 2007-01-20 13:11 kelnos * xfdesktop/trunk/doc/C/xfdesktop.html, Modified: xfdesktop/tags/xfce_4_4_0/NEWS === --- xfdesktop/tags/xfce_4_4_0/NEWS 2007-01-21 11:53:28 UTC (rev 24682) +++ xfdesktop/tags/xfce_4_4_0/NEWS 2007-01-21 11:53:44 UTC (rev 24683) @@ -1,3 +1,84 @@ +20070121 (Xfce 4.4.0): +-- + +We're just about ready to release Xfce 4.4.0! Hooray! There have been +many changes since my last entry. + +Change since 4.4rc2: + + * Fix support for applications that do pseudo-transparency (bug 2508). + * Change how icon cell size is calculated to avoid weirdness at large +sizes (bug 1546). + * Fix icons disappearing when the icon/text size is set too large, and +then not reappearing when the size is lowered again (bug 1546). + * Add hidden options to disable showing any or all of the 'File System', +'Home', or 'Trash' icons. + * Partially fix backdrop setting problems when unsetting Xinerama +stretch mode (bug 2573). + * Fix some possible (but unliklely) NULL pointer dereferences. + * Update documentation. + +Changes since 4.4rc1: + + * Fix crash when non-file:// URIs are dropped on the desktop (bug 2229). + * Handle Xinerama-enabled setups correctly so icons aren't placed in +dead areas or on the boundary between monitors (bug 1538). + * Fix crash when reloading the desktop several times quickly (bug 2426). + * Trash files by default, add binding for shift+delete to force +deletion (bug 2185). + * Fix crash when screen size changes (bug 2457). + * Fix problems with activating icons (bug 2452, 2206). + * Allow the icons to provide better information about what drag/drop +actions are allowed, so user feedback about drags/drops is much +better. + * Fix broken drop of multiple files onto the desktop (bug 2437). + * Be sure to notice if a removable volume's mount point changes +(bug 2489). + * Fix 100% CPU problem when the desktop folder is deleted (bug 2160). + +Changes since 4.4beta2: + + * Fix backdrop image tearing during expose (bug 1944). + * Show icon tooltips where appropriate (bug 1526). + * Use thunarx extensions for the icon context menus and properties +dialogs. + * Fix ugly gradients in the desktop wallpaper on 16-bit displays +(bug 1819). + * Don't show a folder for the desktop directory itself (bug 1916). + * Fix problems with markup
[Xfce4-commits] r24684 - in xfce-installers/trunk: . thunar xfce44
Author: benny Date: 2007-01-21 12:48:02 + (Sun, 21 Jan 2007) New Revision: 24684 Added: xfce-installers/trunk/thunar/thunar-bundle.xml Modified: xfce-installers/trunk/ChangeLog xfce-installers/trunk/thunar/ xfce-installers/trunk/thunar/Makefile xfce-installers/trunk/thunar/thunar.xml xfce-installers/trunk/xfce44/solaris-Xresources.xfce4 xfce-installers/trunk/xfce44/solaris-Xsession.xfce4 xfce-installers/trunk/xfce44/xfce44.xml Log: 2007-01-20 Benedikt Meurer [EMAIL PROTECTED] * thunar/, xfce/: Update the Thunar and Xfce installers. Modified: xfce-installers/trunk/ChangeLog === --- xfce-installers/trunk/ChangeLog 2007-01-21 11:53:44 UTC (rev 24683) +++ xfce-installers/trunk/ChangeLog 2007-01-21 12:48:02 UTC (rev 24684) @@ -1,3 +1,7 @@ +2007-01-20 Benedikt Meurer [EMAIL PROTECTED] + + * thunar/, xfce/: Update the Thunar and Xfce installers. + 2007-01-19 Benedikt Meurer [EMAIL PROTECTED] * terminal/: Update the terminal installer xml. Property changes on: xfce-installers/trunk/thunar ___ Name: svn:ignore - *.run release + *.run release release-bundle Modified: xfce-installers/trunk/thunar/Makefile === --- xfce-installers/trunk/thunar/Makefile 2007-01-21 11:53:44 UTC (rev 24683) +++ xfce-installers/trunk/thunar/Makefile 2007-01-21 12:48:02 UTC (rev 24684) @@ -1,6 +1,6 @@ # $Id$ # -# Copyright (c) 2003-2006 os-cillation +# Copyright (c) 2003-2007 os-cillation # All rights reserved. # # Written by Benedikt Meurer [EMAIL PROTECTED] @@ -24,7 +24,11 @@ all: build build: + i2t-generate thunar-bundle.xml i2t-generate thunar.xml export: +clean: + rm -f *.run + Copied: xfce-installers/trunk/thunar/thunar-bundle.xml (from rev 24680, xfce-installers/trunk/thunar/thunar.xml) === --- xfce-installers/trunk/thunar/thunar-bundle.xml (rev 0) +++ xfce-installers/trunk/thunar/thunar-bundle.xml 2007-01-21 12:48:02 UTC (rev 24684) @@ -0,0 +1,162 @@ +?xml version=1.0 encoding=UTF-8? + +installer + + i2t:application +nameThunar-Bundle/name +titleThunar Bundle/title +version0.8.0/version +image name=iconicon.png/image + /i2t:application + + !-- +i2t:help type=urlhttp://www.os-cillation.com//i2t:help + -- + + i2t:dependencies +dependency type=package + nameglib-2.0/name + version2.6.4/version + description +The Glib library provides useful routines for C programs. Version 2.6.4 is required here, +because earlier versions of the 2.6 branch had a critical bug that caused programs to crash. +Debian/Ubuntu users should install the libglib2.0-dev package. + /description +/dependency + +dependency type=package + namegtk+-2.0/name + version2.6.0/version + description +The GTK+ library provides widgets used for the user interface of all Xfce applications. +Debian/Ubuntu users should install the libgtk2.0-dev package. + /description +/dependency + +dependency type=package + namelibpng12/name + version1.2.0/version + description +The PNG library is used to implement the Thumbnail Management Standard, which uses PNG to store +thumbnails and associated data. Debian/Ubuntu users should install the libpng12-dev package. + /description +/dependency + +dependency type=package + namehal-storage/name + version0.5.0/version + description +This package provides support for the Hardware Abstraction Layer (HAL) in Xfce. This enables +support for removable media in Thunar and xfdesktop, support to shutdown the computer via HAL +and automatic management of removable devices. Debian/Ubuntu users should install the +libhal-storage-dev package. + /description +/dependency + +dependency type=package + namedbus-glib-1/name + version0.34/version + description +This package provides support for the D-BUS message daemon, which is used for interprocess +communication of the various parts of the desktop and to talk to the HAL daemon. Especially +for HAL support you will need both this package and the hal-storage package above. Debian/Ubuntu +users should install the libdbus-glib-1-dev package. + /description +/dependency + +dependency type=package + nametaglib/name + version1.4/version + description +This package is required by the media tags plugin to extract and save the tags stored within audio +files. Debian/Ubuntu users should install the libtag1-dev package. + /description +/dependency + +
[Xfce4-commits] r24686 - xfce4-icon-theme/trunk
Author: benny Date: 2007-01-21 17:59:28 + (Sun, 21 Jan 2007) New Revision: 24686 Modified: xfce4-icon-theme/trunk/configure.in.in Log: Fix version handling. Modified: xfce4-icon-theme/trunk/configure.in.in === --- xfce4-icon-theme/trunk/configure.in.in 2007-01-21 14:08:17 UTC (rev 24685) +++ xfce4-icon-theme/trunk/configure.in.in 2007-01-21 17:59:28 UTC (rev 24686) @@ -11,7 +11,7 @@ m4_define([xit_version_minor], [4]) m4_define([xit_version_micro], [0]) m4_define([xit_version_nano], []) -m4_define([xit_version], [xit_version_major().xit_version_minor().xit_version_micro().xit_version_nano()]) +m4_define([xit_version], [xit_version_major().xit_version_minor().xit_version_micro()ifelse(xit_version_nano(), [], [], [.xit_version_nano()])]) dnl # DO NOT MODIFY ANYTHING BELOW THIS LINE, UNLESS YOU KNOW WHAT ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24687 - xfce4-icon-theme/tags/xfce_4_4_0
Author: benny Date: 2007-01-21 18:01:24 + (Sun, 21 Jan 2007) New Revision: 24687 Modified: xfce4-icon-theme/tags/xfce_4_4_0/configure.in.in Log: Fix version handling. Modified: xfce4-icon-theme/tags/xfce_4_4_0/configure.in.in === --- xfce4-icon-theme/tags/xfce_4_4_0/configure.in.in2007-01-21 17:59:28 UTC (rev 24686) +++ xfce4-icon-theme/tags/xfce_4_4_0/configure.in.in2007-01-21 18:01:24 UTC (rev 24687) @@ -11,7 +11,7 @@ m4_define([xit_version_minor], [4]) m4_define([xit_version_micro], [0]) m4_define([xit_version_nano], []) -m4_define([xit_version], [xit_version_major().xit_version_minor().xit_version_micro().xit_version_nano()]) +m4_define([xit_version], [xit_version_major().xit_version_minor().xit_version_micro()ifelse(xit_version_nano(), [], [], [.xit_version_nano()])]) dnl # DO NOT MODIFY ANYTHING BELOW THIS LINE, UNLESS YOU KNOW WHAT ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24688 - mousepad/trunk
Author: benny Date: 2007-01-21 19:04:02 + (Sun, 21 Jan 2007) New Revision: 24688 Modified: mousepad/trunk/configure.in.in Log: Ok, this time it's really 0.2.12! Modified: mousepad/trunk/configure.in.in === --- mousepad/trunk/configure.in.in 2007-01-21 18:01:24 UTC (rev 24687) +++ mousepad/trunk/configure.in.in 2007-01-21 19:04:02 UTC (rev 24688) @@ -9,9 +9,9 @@ dnl *** m4_define([mp_version_major], [0]) m4_define([mp_version_minor], [2]) -m4_define([mp_version_micro], [13]) +m4_define([mp_version_micro], [12]) m4_define([mp_version_build], [EMAIL PROTECTED]@]) -m4_define([mp_version_tag], [svn]) +m4_define([mp_version_tag], []) m4_define([mp_version], [mp_version_major().mp_version_minor().mp_version_micro()ifelse(mp_version_tag(), [svn], [mp_version_tag()-mp_version_build()], [mp_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24689 - mousepad/tags
Author: benny Date: 2007-01-21 19:04:38 + (Sun, 21 Jan 2007) New Revision: 24689 Added: mousepad/tags/mousepad-0.2.12/ Log: Tag 0.2.12 release (really!) Copied: mousepad/tags/mousepad-0.2.12 (from rev 24688, mousepad/trunk) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24690 - mousepad/tags
Author: benny Date: 2007-01-21 19:05:14 + (Sun, 21 Jan 2007) New Revision: 24690 Modified: mousepad/tags/xfce_4_4_0 Log: Fix xfce_4_4_0 tag link. Modified: mousepad/tags/xfce_4_4_0 === --- mousepad/tags/xfce_4_4_02007-01-21 19:04:38 UTC (rev 24689) +++ mousepad/tags/xfce_4_4_02007-01-21 19:05:14 UTC (rev 24690) @@ -1 +1 @@ -link mousepad-0.2.10 \ No newline at end of file +link mousepad-0.2.12 \ No newline at end of file ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24691 - mousepad/trunk
Author: benny Date: 2007-01-21 19:10:07 + (Sun, 21 Jan 2007) New Revision: 24691 Modified: mousepad/trunk/configure.in.in Log: Back to life... Modified: mousepad/trunk/configure.in.in === --- mousepad/trunk/configure.in.in 2007-01-21 19:05:14 UTC (rev 24690) +++ mousepad/trunk/configure.in.in 2007-01-21 19:10:07 UTC (rev 24691) @@ -9,9 +9,9 @@ dnl *** m4_define([mp_version_major], [0]) m4_define([mp_version_minor], [2]) -m4_define([mp_version_micro], [12]) +m4_define([mp_version_micro], [13]) m4_define([mp_version_build], [EMAIL PROTECTED]@]) -m4_define([mp_version_tag], []) +m4_define([mp_version_tag], [svn]) m4_define([mp_version], [mp_version_major().mp_version_minor().mp_version_micro()ifelse(mp_version_tag(), [svn], [mp_version_tag()-mp_version_build()], [mp_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24693 - mousepad/trunk/src
Author: erikharrison
Date: 2007-01-22 04:00:36 + (Mon, 22 Jan 2007)
New Revision: 24693
Modified:
mousepad/trunk/src/main.c
Log:
Applied patch from Alexander Toresson
Modified: mousepad/trunk/src/main.c
===
--- mousepad/trunk/src/main.c 2007-01-22 00:25:12 UTC (rev 24692)
+++ mousepad/trunk/src/main.c 2007-01-22 04:00:36 UTC (rev 24693)
@@ -65,22 +65,43 @@
return -1;
/* version num */
- fgets(buf, sizeof(buf), fp);
+ if (!fgets(buf, sizeof(buf), fp)) return -1;
num = g_strsplit(buf, . , 3);
if ((atoi(num[1]) = 1) (atoi(num[2]) = 0)) {
- fgets(buf, sizeof(buf), fp);
- sd-conf.width = atoi(buf);
- fgets(buf, sizeof(buf), fp);
- sd-conf.height = atoi(buf);
- fgets(buf, sizeof(buf), fp);
+ if (!fgets(buf, sizeof(buf), fp)) return -1;
+ if (buf[0] = '0' buf[0] = '9')
+ sd-conf.width = atoi(buf);
+ else
+ return -1;
+
+ if (!fgets(buf, sizeof(buf), fp)) return -1;
+ if (buf[0] = '0' buf[0] = '9')
+ sd-conf.height = atoi(buf);
+ else
+ return -1;
+
+ if (!fgets(buf, sizeof(buf), fp)) return -1;
sd-conf.fontname = g_strdup(buf);
- fgets(buf, sizeof(buf), fp);
- sd-conf.wordwrap = atoi(buf);
- fgets(buf, sizeof(buf), fp);
- sd-conf.linenumbers = atoi(buf);
- fgets(buf, sizeof(buf), fp);
- sd-conf.autoindent = atoi(buf);
- fgets(buf, sizeof(buf), fp);
+
+ if (!fgets(buf, sizeof(buf), fp)) return -1;
+ if (buf[0] = '0' buf[0] = '1')
+ sd-conf.wordwrap = atoi(buf);
+ else
+ return -1;
+
+ if (!fgets(buf, sizeof(buf), fp)) return -1;
+ if (buf[0] = '0' buf[0] = '1')
+ sd-conf.linenumbers = atoi(buf);
+ else
+ return -1;
+
+ if (!fgets(buf, sizeof(buf), fp)) return -1;
+ if (buf[0] = '0' buf[0] = '1')
+ sd-conf.autoindent = atoi(buf);
+ else
+ return -1;
+
+ if (!fgets(buf, sizeof(buf), fp)) return -1;
if (strcmp(buf, 0) != 0)
sd-conf.charset = g_strdup(buf);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
