Author: megabajt Date: Wed Mar 12 20:18:16 2008 GMT Module: SOURCES Tag: HEAD ---- Log message: - port gnome-mount to GIO - fix some crashes
---- Files affected: SOURCES: gnome-mount-branch.diff (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/gnome-mount-branch.diff diff -u /dev/null SOURCES/gnome-mount-branch.diff:1.1 --- /dev/null Wed Mar 12 21:18:17 2008 +++ SOURCES/gnome-mount-branch.diff Wed Mar 12 21:18:11 2008 @@ -0,0 +1,8423 @@ +diff -urN gnome-mount-0.7/ChangeLog gnome-mount/ChangeLog +--- gnome-mount-0.7/ChangeLog 2007-10-12 00:30:42.000000000 +0200 ++++ gnome-mount/ChangeLog 2008-03-12 20:26:38.000000000 +0100 +@@ -1,3 +1,17 @@ ++2008-02-25 David Zeuthen <[EMAIL PROTECTED]> ++ ++ * configure.in: Bump version to 0.8. Get rid of libgnomeui ++ dependency. Require recent glib and nautilus versions if building ++ the Nautilus extension. ++ ++ * src/Makefile.am: ++ * src/gnome-mount-properties-view.[ch]: ++ * src/gnome-mount-properties.c: Port to new nautilus extensions ++ API. Avoid debug spew. ++ ++ * src/gnome-mount.c: Fix crasher when unreffing a toplevel; use ++ gtk_widget_destroy() instead. Avoid lots of debug spew. ++ + ==================== 0.7 ==================== + + 2007-10-11 David Zeuthen <[EMAIL PROTECTED]> +diff -urN gnome-mount-0.7/configure.in gnome-mount/configure.in +--- gnome-mount-0.7/configure.in 2007-08-01 02:49:20.000000000 +0200 ++++ gnome-mount/configure.in 2008-03-12 20:26:38.000000000 +0100 +@@ -1,6 +1,6 @@ + AC_PREREQ(2.52) + +-AC_INIT(gnome-mount, 0.7) ++AC_INIT(gnome-mount, 0.8) + AC_CONFIG_SRCDIR(src) + AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) + AM_CONFIG_HEADER(config.h) +@@ -83,19 +83,19 @@ + fi + AM_CONDITIONAL(ENABLE_NAUTILUS_EXTENSION, test "x$enable_nautilus_extension" = "xyes") + ++GLIB_REQUIRED=2.15.0 ++NAUTILUS_REQUIRED=2.21.2 ++ + PKG_CHECK_MODULES(GNOME_MOUNT, gconf-2.0 gnome-keyring-1 >= 0.4 dbus-glib-1 >= 0.31 hal-storage >= 0.5.8.1 gtk+-2.0 >= 2.8.0) + AC_SUBST(GNOME_MOUNT_CFLAGS) + AC_SUBST(GNOME_MOUNT_LIBS) + + if test "x$enable_nautilus_extension" = "xyes"; then +- PKG_CHECK_MODULES(GNOME_MOUNT_PROPERTIES, libgnomeui-2.0 >= 2.1.5 libglade-2.0 hal-storage >= 0.5.8.1 dbus-1 >= 0.60 dbus-glib-1 >= 0.60 gtk+-2.0 >= 2.8.0) ++ PKG_CHECK_MODULES(GNOME_MOUNT_PROPERTIES, libglade-2.0 hal-storage >= 0.5.8.1 dbus-1 >= 0.60 dbus-glib-1 >= 0.60 gtk+-2.0 >= 2.8.0 glib-2.0 >= $GLIB_REQUIRED) + AC_SUBST(GNOME_MOUNT_PROPERTIES_CFLAGS) + AC_SUBST(GNOME_MOUNT_PROPERTIES_LIBS) + +- NAUTILUS_REQUIRED=2.5.0 +- EEL_REQUIRED=2.5.0 +- +- PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED eel-2.0 >= $EEL_REQUIRED) ++ PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED) + AC_SUBST(NAUTILUS_CFLAGS) + AC_SUBST(NAUTILUS_LIBS) + fi +diff -urN gnome-mount-0.7/MAINTAINERS gnome-mount/MAINTAINERS +--- gnome-mount-0.7/MAINTAINERS 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-mount/MAINTAINERS 2008-03-12 20:26:38.000000000 +0100 +@@ -0,0 +1,3 @@ ++David Zeuthen ++E-mail: [EMAIL PROTECTED] ++Userid: davidz +diff -urN gnome-mount-0.7/po/ar.po gnome-mount/po/ar.po +--- gnome-mount-0.7/po/ar.po 2007-08-01 02:49:20.000000000 +0200 ++++ gnome-mount/po/ar.po 2008-03-12 20:26:38.000000000 +0100 +@@ -1,4 +1,4 @@ +-# translation of gnome-mount.HEAD.ar.po to Arabic ++# translation of gnome-mount.HEAD.po to Arabic + # Arabic translations for PACKAGE package. + # Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER + # This file is distributed under the same license as the PACKAGE package. +@@ -7,17 +7,17 @@ + # Khaled Hosny <[EMAIL PROTECTED]>, 2007. + msgid "" + msgstr "" +-"Project-Id-Version: Project\n" ++"Project-Id-Version: gnome-mount.HEAD\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-04-14 16:17+0100\n" +-"PO-Revision-Date: 2007-04-14 02:24+0200\n" ++"POT-Creation-Date: 2007-12-26 15:31+0000\n" ++"PO-Revision-Date: 2007-12-26 15:57+0200\n" + "Last-Translator: Khaled Hosny <[EMAIL PROTECTED]>\n" + "Language-Team: Arabic <[EMAIL PROTECTED]>\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : " +-"3\n" ++"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n>=3 && " ++"n<=10 ? 3 : n>=11 && n<=99 ? 4 : 5;\n" + "X-Poedit-Language: Arabic\n" + "X-Generator: KBabel 1.11.4\n" + +@@ -86,360 +86,345 @@ + + #: ../src/copy-paste/gnome-password-dialog.c:210 + msgid "_Username:" +-msgstr "" ++msgstr "ا_سم المستخدم:" + + #: ../src/copy-paste/gnome-password-dialog.c:213 + msgid "_Domain:" +-msgstr "" ++msgstr "ال_نطاق:" + + #: ../src/copy-paste/gnome-password-dialog.c:216 + msgid "_Password:" +-msgstr "" ++msgstr "_كلمة السر:" + + #: ../src/copy-paste/gnome-password-dialog.c:219 + msgid "_New password:" +-msgstr "" ++msgstr "كلمة السر ال_جديدة:" + + #: ../src/copy-paste/gnome-password-dialog.c:220 + msgid "Con_firm password:" +-msgstr "" ++msgstr "أكّد كل_مة السر:" + + #: ../src/copy-paste/gnome-password-dialog.c:223 + msgid "Password quality:" +-msgstr "" ++msgstr "جودة كلمة السر:" + + #: ../src/copy-paste/gnome-password-dialog.c:338 + msgid "Co_nnect" +-msgstr "" ++msgstr "اتّ_صل" + + #: ../src/copy-paste/gnome-password-dialog.c:371 + msgid "Connect _anonymously" +-msgstr "" ++msgstr "اتّصل كمج_هول" + + #: ../src/copy-paste/gnome-password-dialog.c:376 + msgid "Connect as u_ser:" +-msgstr "" ++msgstr "اتصل كم_ستخدم:" + + #: ../src/copy-paste/gnome-password-dialog.c:438 + msgid "_Forget password immediately" +-msgstr "" ++msgstr "ا_نسى كلمة السرِّ حالًا" + + #: ../src/copy-paste/gnome-password-dialog.c:444 + msgid "_Remember password until you logout" +-msgstr "" ++msgstr "_تذكّر كلمة السر حتى خروجك" + + #: ../src/copy-paste/gnome-password-dialog.c:450 + msgid "_Remember forever" +-msgstr "" ++msgstr "_تذكّر للأبد" + +-#: ../src/gnome-mount.c:108 +-#, fuzzy ++#: ../src/gnome-mount.c:183 + msgid "Unable to mount media." +-msgstr "لا يمكن طرد الوسيط" ++msgstr "تعذّر وصل الوسيط." + +-#: ../src/gnome-mount.c:111 ++#: ../src/gnome-mount.c:186 + msgid "There is probably no media in the drive." +-msgstr "" ++msgstr "ربما لا توجد وسائط في المشغل." + +-#: ../src/gnome-mount.c:141 +-#, fuzzy ++#: ../src/gnome-mount.c:216 + msgid "Cannot eject volume" +-msgstr "اطرد الحجم المنتقى" ++msgstr "تعذر إخراج الجزء" + +-#: ../src/gnome-mount.c:152 ++#: ../src/gnome-mount.c:227 + #, c-format + msgid "You are not privileged to eject the volume '%s'." +-msgstr "" ++msgstr "ليس مسموحا لك بإخراج الجزء '%s'." + +-#: ../src/gnome-mount.c:153 ++#: ../src/gnome-mount.c:228 + msgid "You are not privileged to eject this volume." +-msgstr "" ++msgstr "ليس مسموحا لك بإخراج هذا الجزء." + +-#: ../src/gnome-mount.c:161 ++#: ../src/gnome-mount.c:236 + #, c-format + msgid "An application is preventing the volume '%s' from being ejected." + msgstr "" + +-#: ../src/gnome-mount.c:162 ++#: ../src/gnome-mount.c:237 + msgid "An application is preventing the volume from being ejected." + msgstr "" + +-#: ../src/gnome-mount.c:171 +-#, fuzzy, c-format ++#: ../src/gnome-mount.c:246 ++#, c-format + msgid "Cannot eject the volume '%s'." +-msgstr "اطرد الحجم المنتقى" ++msgstr "" + +-#: ../src/gnome-mount.c:172 +-#, fuzzy ++#: ../src/gnome-mount.c:247 + msgid "Cannot eject the volume." +-msgstr "اطرد الحجم المنتقى" ++msgstr "" + +-#: ../src/gnome-mount.c:215 +-#, fuzzy ++#: ../src/gnome-mount.c:290 + msgid "Cannot unmount volume" +-msgstr "الغي ضم الحجم المنتقى" ++msgstr "" + +-#: ../src/gnome-mount.c:226 ++#: ../src/gnome-mount.c:301 + #, c-format + msgid "You are not privileged to unmount the volume '%s'." + msgstr "" + +-#: ../src/gnome-mount.c:227 ++#: ../src/gnome-mount.c:302 + msgid "You are not privileged to unmount this volume." + msgstr "" + +-#: ../src/gnome-mount.c:236 ++#: ../src/gnome-mount.c:311 + #, c-format + msgid "An application is preventing the volume '%s' from being unmounted." + msgstr "" + +-#: ../src/gnome-mount.c:237 ++#: ../src/gnome-mount.c:312 + msgid "An application is preventing the volume from being unmounted." + msgstr "" + +-#: ../src/gnome-mount.c:244 +-#, fuzzy, c-format ++#: ../src/gnome-mount.c:319 ++#, c-format + msgid "The volume '%s' is not mounted." +-msgstr "“%s” لا يجيب" ++msgstr "" + +-#: ../src/gnome-mount.c:245 +-#, fuzzy ++#: ../src/gnome-mount.c:320 + msgid "The volume is not mounted." +-msgstr "“%s” لا يجيب" ++msgstr "" + +-#: ../src/gnome-mount.c:253 +-#, fuzzy, c-format ++#: ../src/gnome-mount.c:328 ++#, c-format + msgid "Cannot unmount the volume '%s'." +-msgstr "الغي ضم الحجم المنتقى" ++msgstr "" + +-#: ../src/gnome-mount.c:254 +-#, fuzzy ++#: ../src/gnome-mount.c:329 + msgid "Cannot unmount the volume." +-msgstr "الغي ضم الحجم المنتقى" ++msgstr "" + +-#: ../src/gnome-mount.c:262 ++#: ../src/gnome-mount.c:337 + #, c-format + msgid "The volume '%s' was probably mounted manually on the command line." + msgstr "" + +-#: ../src/gnome-mount.c:263 ++#: ../src/gnome-mount.c:338 + msgid "The volume was probably mounted manually on the command line." + msgstr "" + +-#: ../src/gnome-mount.c:273 ../src/gnome-mount.c:416 +-#, fuzzy, c-format ++#: ../src/gnome-mount.c:348 ../src/gnome-mount.c:502 ++#, c-format + msgid "Error <i>%s</i>." +-msgstr "خطأ" ++msgstr "خطأ <i>%s</i>." + +-#: ../src/gnome-mount.c:283 ../src/gnome-mount.c:428 +-#, fuzzy ++#: ../src/gnome-mount.c:358 ../src/gnome-mount.c:514 + msgid "_Details" +-msgstr "_التّفاصيل" ++msgstr "ال_تّفاصيل" + +-#: ../src/gnome-mount.c:336 +-#, fuzzy ++#: ../src/gnome-mount.c:411 + msgid "Cannot mount volume." +-msgstr "ضُمّ الحجم المنتقى" ++msgstr "" + +-#: ../src/gnome-mount.c:347 ++#: ../src/gnome-mount.c:422 + #, c-format + msgid "You are not privileged to mount the volume '%s'." + msgstr "" + +-#: ../src/gnome-mount.c:348 ++#: ../src/gnome-mount.c:423 + msgid "You are not privileged to mount this volume." + msgstr "" + +-#: ../src/gnome-mount.c:355 ++#: ../src/gnome-mount.c:430 + #, c-format + msgid "Invalid mount option when attempting to mount the volume '%s'." + msgstr "" + +-#: ../src/gnome-mount.c:356 ++#: ../src/gnome-mount.c:431 + msgid "Invalid mount option when attempting to mount the volume." + msgstr "" + +-#: ../src/gnome-mount.c:362 ++#: ../src/gnome-mount.c:437 + #, c-format + msgid "" + "The volume '%s' uses the <i>%s</i> file system which is not supported by " + "your system." + msgstr "" + +-#: ../src/gnome-mount.c:363 ++#: ../src/gnome-mount.c:438 + #, c-format + msgid "" + "The volume uses the <i>%s</i> file system which is not supported by your " + "system." + msgstr "" + +-#: ../src/gnome-mount.c:379 +-#, fuzzy, c-format ++#: ../src/gnome-mount.c:454 ++#, c-format + msgid "Unable to mount the volume '%s'." +-msgstr "لا يمكن تجهيز الحجم المختار." ++msgstr "" + +-#: ../src/gnome-mount.c:380 +-#, fuzzy ++#: ../src/gnome-mount.c:455 + msgid "Unable to mount the volume." +-msgstr "لا يمكن تجهيز الحجم المختار." ++msgstr "" + +-#: ../src/gnome-mount.c:395 +-#, fuzzy, c-format ++#: ../src/gnome-mount.c:470 ++#, c-format + msgid "Volume '%s' is already mounted." + msgstr "" +-"الإختصار \"%s\" مستخدم لـ:\n" +-" \"%s\"\n" + +-#: ../src/gnome-mount.c:396 +-#, fuzzy ++#: ../src/gnome-mount.c:471 + msgid "Volume is already mounted." + msgstr "" +-"الإختصار \"%s\" مستخدم لـ:\n" +-" \"%s\"\n" + +-#: ../src/gnome-mount.c:744 +-#, fuzzy, c-format ++#: ../src/gnome-mount.c:837 ++#, c-format + msgid "Mounted %s at \"%s\"\n" +-msgstr "اليوم عند %-I:%M %p" ++msgstr "" + +-#: ../src/gnome-mount.c:1068 ../src/gnome-mount.c:1628 +-#: ../src/gnome-mount.c:1833 ++#: ../src/gnome-mount.c:1161 ../src/gnome-mount.c:1721 ++#: ../src/gnome-mount.c:1936 + #, c-format + msgid "Device %s is in /etc/fstab with mount point \"%s\"\n" + msgstr "" + +-#: ../src/gnome-mount.c:1111 ++#: ../src/gnome-mount.c:1204 + #, c-format + msgid "Mounted %s at \"%s\" (using /etc/fstab)\n" + msgstr "" + +-#: ../src/gnome-mount.c:1472 +-#, fuzzy ++#: ../src/gnome-mount.c:1565 + msgid "Writing data to device" +-msgstr "فشل فتح الجهاز" ++msgstr "" + +-#: ../src/gnome-mount.c:1473 ++#: ../src/gnome-mount.c:1566 + #, c-format + msgid "" + "There is data that needs to be written to the device %s before it can be " + "removed. Please do not remove the media or disconnect the drive." + msgstr "" + +-#: ../src/gnome-mount.c:1515 ++#: ../src/gnome-mount.c:1608 + msgid "Device is now safe to remove" + msgstr "" + +-#: ../src/gnome-mount.c:1516 ++#: ../src/gnome-mount.c:1609 + #, c-format + msgid "The device %s is now safe to remove." + msgstr "" + +-#: ../src/gnome-mount.c:1664 ++#: ../src/gnome-mount.c:1757 + #, c-format + msgid "Unmounted %s (using /etc/fstab)\n" + msgstr "" + +-#: ../src/gnome-mount.c:1734 ++#: ../src/gnome-mount.c:1837 + #, c-format + msgid "Unmounted %s\n" + msgstr "" + +-#: ../src/gnome-mount.c:1869 ++#: ../src/gnome-mount.c:1972 + #, c-format + msgid "Ejected %s (using /etc/fstab).\n" + msgstr "" + +-#: ../src/gnome-mount.c:1938 ++#: ../src/gnome-mount.c:2051 + #, c-format + msgid "Ejected %s\n" + msgstr "" + +-#: ../src/gnome-mount.c:2078 +-#, fuzzy, c-format ++#: ../src/gnome-mount.c:2191 ++#, c-format + msgid "Enter password to unlock encrypted data for %s: " +-msgstr "أدخل كلمة السر لفك قفل حلقة المفاتيح" ++msgstr "" + +-#: ../src/gnome-mount.c:2101 ++#: ../src/gnome-mount.c:2214 + #, c-format + msgid "" +-"The storage device%s contains encrypted data. Enter a password to unlock." ++"The storage device %s contains encrypted data. Enter a password to unlock." + msgstr "" + +-#: ../src/gnome-mount.c:2103 +-#, fuzzy ++#: ../src/gnome-mount.c:2216 + msgid "Unlock Encrypted Data" +-msgstr "مرجع بيانات كائن" ++msgstr "" + +-#: ../src/gnome-mount.c:2202 ++#: ../src/gnome-mount.c:2315 + #, c-format + msgid "Setup clear-text device for %s.\n" + msgstr "" + +-#: ../src/gnome-mount.c:2268 ++#: ../src/gnome-mount.c:2381 + #, c-format + msgid "Teared down clear-text device for %s.\n" + msgstr "" + +-#: ../src/gnome-mount.c:2314 ++#: ../src/gnome-mount.c:2427 + #, c-format + msgid "Clear text device is %s. Mounting.\n" + msgstr "" + +-#: ../src/gnome-mount.c:2650 ++#: ../src/gnome-mount.c:2763 ++#, c-format + msgid "X display not available - using text-based operation.\n" + msgstr "" + +-#: ../src/gnome-mount.c:2731 +-#, fuzzy, c-format ++#: ../src/gnome-mount.c:2844 ++#, c-format + msgid "Resolved device file %s -> %s\n" +-msgstr "الجهاز المحتوي على نظام الملفات ال_جذر:" ++msgstr "" + +-#: ../src/gnome-mount.c:2745 ++#: ../src/gnome-mount.c:2858 + #, c-format + msgid "Resolved pseudonym \"%s\" -> %s\n" + msgstr "" + +-#: ../src/gnome-mount.c:2747 +-#, fuzzy, c-format ++#: ../src/gnome-mount.c:2860 ++#, c-format + msgid "Cannot resolve pseudonym \"%s\" to a volume\n" +-msgstr "لا يمكنك نقل الحجم \"%s\" للمهملات." ++msgstr "" + +-#: ../src/gnome-mount.c:2751 ++#: ../src/gnome-mount.c:2864 ++#, c-format + msgid "Use --hal-udi, --device or --pseudonym to specify volume\n" + msgstr "" + +-#: ../src/gnome-mount.c:2799 ++#: ../src/gnome-mount.c:2912 + #, c-format + msgid "Drive %s does not contain media." + msgstr "لا يحوي الجهاز '%s' وسيطا." + + #. Silently fail +-#: ../src/gnome-mount.c:2809 ++#: ../src/gnome-mount.c:2922 + #, c-format + msgid "Given device '%s' is not a volume or a drive." + msgstr "" + +-#: ../src/gnome-mount.c:2844 ++#: ../src/gnome-mount.c:2957 + msgid "Cannot unmount and eject simultaneously" +-msgstr "تعذّر فك الضم والطرد في آن واحد" ++msgstr "لا يمكن الفصل والإخراج في آن واحد" + +-#: ../src/gnome-mount.c:2908 ++#: ../src/gnome-mount.c:3021 + #, c-format + msgid "Crypto volume '%s' is already setup with clear volume '%s'" + msgstr "" + +-#: ../src/gnome-mount.c:2933 ++#: ../src/gnome-mount.c:3046 + msgid "Bad crypto password" +-msgstr "كلمة سر تعمية سيئة..." ++msgstr "كلمة سر تعمية سيئة" + +-#: ../src/gnome-mount.c:2939 +-#, fuzzy ++#: ../src/gnome-mount.c:3052 + msgid "Bailing out..." +-msgstr "اخرج" ++msgstr "" + + #: ../src/gnome-mount-properties.glade.h:1 + msgid "<b>Connection:</b>" +-msgstr "<b>الإتصال</b>" ++msgstr "<b>الاتصال</b>" + + #: ../src/gnome-mount-properties.glade.h:2 + msgid "<b>External:</b>" +@@ -454,9 +439,8 @@ + msgstr "" + + #: ../src/gnome-mount-properties.glade.h:5 +-#, fuzzy + msgid "<b>Label:</b>" +-msgstr "علامة" ++msgstr "" + + #: ../src/gnome-mount-properties.glade.h:6 + msgid "<b>Media:</b>" +@@ -468,11 +452,11 @@ + + #: ../src/gnome-mount-properties.glade.h:8 + msgid "<b>Mount Options:</b>" +-msgstr "<b>خيارات الضمّ:</b>" ++msgstr "<b>خيارات الوصل:</b>" + + #: ../src/gnome-mount-properties.glade.h:9 + msgid "<b>Mount Point:</b>" <<Diff was trimmed, longer than 597 lines>> _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
