[Xfce4-commits] r25585 - in squeeze/trunk: . libsqueeze po src
Stephan Arts
stephan at xfce.org
Mon Apr 16 11:32:02 CEST 2007
Author: stephan
Date: 2007-04-16 09:32:02 +0000 (Mon, 16 Apr 2007)
New Revision: 25585
Modified:
squeeze/trunk/configure.in.in
squeeze/trunk/libsqueeze/macro-command.c
squeeze/trunk/libsqueeze/spawn-command.c
squeeze/trunk/po/squeeze.pot
squeeze/trunk/src/application.c
squeeze/trunk/src/message_dialog.c
Log:
Bump trunk version number, fix macro-command termination.
Modified: squeeze/trunk/configure.in.in
===================================================================
--- squeeze/trunk/configure.in.in 2007-04-15 21:39:30 UTC (rev 25584)
+++ squeeze/trunk/configure.in.in 2007-04-16 09:32:02 UTC (rev 25585)
@@ -9,14 +9,14 @@
dnl ***************************
dnl *** Version information ***
dnl ***************************
-m4_define([squeeze_verinfo], [0:2:0])
+m4_define([squeeze_verinfo], [0:3:0])
m4_define([squeeze_version_branch], [])
m4_define([squeeze_version_major], [0])
m4_define([squeeze_version_minor], [2])
-m4_define([squeeze_version_micro], [0])
+m4_define([squeeze_version_micro], [9])
m4_define([squeeze_version_nano], []) # Leave empty for no nano version
m4_define([squeeze_version_build], [r at REVISION@])
-m4_define([squeeze_version_tag], []) # Leave empty for releases
+m4_define([squeeze_version_tag], [svn]) # Leave empty for releases
m4_define([squeeze_version], [ifelse(squeeze_version_branch(), [], [squeeze_version_major().squeeze_version_minor().squeeze_version_micro()ifelse(squeeze_version_nano(), [], [], [.squeeze_version_nano()])], [squeeze_version_branch()])ifelse(squeeze_version_tag(),[],[], [-ifelse(squeeze_version_tag(), [svn], [squeeze_version_tag()-squeeze_version_build()], [squeeze_version_tag()])])])
dnl *******************************************
Modified: squeeze/trunk/libsqueeze/macro-command.c
===================================================================
--- squeeze/trunk/libsqueeze/macro-command.c 2007-04-15 21:39:30 UTC (rev 25584)
+++ squeeze/trunk/libsqueeze/macro-command.c 2007-04-16 09:32:02 UTC (rev 25585)
@@ -182,7 +182,7 @@
lsq_archive_state_changed(LSQ_ARCHIVE_COMMAND(macro_command)->archive);
- if(!lsq_archive_command_execute(command))
+ if(!lsq_archive_command_execute(command) || error)
{
g_signal_handlers_disconnect_by_func(command, cb_macro_command_sub_command_terminated, macro_command);
/* And here i kind of have no idea if this works */
Modified: squeeze/trunk/libsqueeze/spawn-command.c
===================================================================
--- squeeze/trunk/libsqueeze/spawn-command.c 2007-04-15 21:39:30 UTC (rev 25584)
+++ squeeze/trunk/libsqueeze/spawn-command.c 2007-04-16 09:32:02 UTC (rev 25585)
@@ -241,7 +241,10 @@
if(command->running)
{
if(spawn_command->child_pid != 0)
+ {
kill ( spawn_command->child_pid , SIGHUP);
+ //kill ( spawn_command->child_pid , SIGKILL);
+ }
else
return FALSE; /* command isn't running */
}
Modified: squeeze/trunk/po/squeeze.pot
===================================================================
--- squeeze/trunk/po/squeeze.pot 2007-04-15 21:39:30 UTC (rev 25584)
+++ squeeze/trunk/po/squeeze.pot 2007-04-16 09:32:02 UTC (rev 25585)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-04-15 23:01+0200\n"
+"POT-Creation-Date: 2007-04-16 00:11+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,77 +16,103 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../libsqueeze/archive.c:268
-msgid "Name"
+#: ../src/button_drag_box.c:85
+msgid "Visible:"
msgstr ""
-#: ../libsqueeze/archive.c:270
-msgid "Mime type"
+#: ../src/button_drag_box.c:96
+msgid "Available:"
msgstr ""
-#: ../libsqueeze/command-builder.c:122
-msgid "Execute"
+#: ../src/message_dialog.c:155 ../squeeze.desktop.in.h:1
+msgid "Archive manager"
msgstr ""
-#: ../libsqueeze/command-builder-zip.c:107
-#: ../libsqueeze/command-builder-rar.c:127
-msgid "Compressed"
+#: ../src/preferences_dialog.c:85
+msgid "_General"
msgstr ""
-#: ../libsqueeze/command-builder-zip.c:109
-#: ../libsqueeze/command-builder-rar.c:141
-msgid "Method"
+#: ../src/preferences_dialog.c:88
+msgid "Archive viewer:"
msgstr ""
-#: ../libsqueeze/command-builder-zip.c:111
-#: ../libsqueeze/command-builder-gnu-tar.c:149
-#: ../libsqueeze/command-builder-rar.c:129
-msgid "Size"
+#: ../src/preferences_dialog.c:97
+msgid "_Show Icons"
msgstr ""
-#: ../libsqueeze/command-builder-zip.c:113
-#: ../libsqueeze/command-builder-rar.c:131
-msgid "Ratio"
+#: ../src/preferences_dialog.c:100
+msgid "_Rules Hint"
msgstr ""
-#: ../libsqueeze/command-builder-zip.c:115
-#: ../libsqueeze/command-builder-gnu-tar.c:151
-#: ../libsqueeze/command-builder-rar.c:133
-msgid "Date"
+#: ../src/preferences_dialog.c:103
+msgid "Sorting:"
msgstr ""
-#: ../libsqueeze/command-builder-zip.c:117
-#: ../libsqueeze/command-builder-gnu-tar.c:153
-#: ../libsqueeze/command-builder-rar.c:135
-msgid "Time"
+#: ../src/preferences_dialog.c:112
+msgid "Sort _Case Sensitive "
msgstr ""
-#: ../libsqueeze/command-builder-zip.c:155
-#: ../libsqueeze/command-builder-rar.c:181
-msgid "Adding"
+#: ../src/preferences_dialog.c:115
+msgid "Sort _Folders First"
msgstr ""
-#: ../libsqueeze/command-builder-zip.c:172
-#: ../libsqueeze/command-builder-zip.c:174
-#: ../libsqueeze/command-builder-gnu-tar.c:370
-#: ../libsqueeze/command-builder-gnu-tar.c:392
-#: ../libsqueeze/command-builder-rar.c:197
-#: ../libsqueeze/command-builder-rar.c:199
-msgid "Removing"
+#: ../src/preferences_dialog.c:118
+msgid "Navigation bar:"
msgstr ""
-#: ../libsqueeze/command-builder-zip.c:192
-#: ../libsqueeze/command-builder-gnu-tar.c:413
-#: ../libsqueeze/command-builder-gnu-tar.c:415
-#: ../libsqueeze/command-builder-rar.c:216
-msgid "Extracting"
+#: ../src/preferences_dialog.c:130
+msgid "_Behaviour"
msgstr ""
-#: ../libsqueeze/command-builder-zip.c:203
+#: ../src/preferences_dialog.c:147
+msgid "Preferences"
+msgstr ""
+
+#: ../src/preferences_dialog.c:204
+msgid "_Archivers"
+msgstr ""
+
+#: ../src/preferences_dialog.c:281
+msgid "Filename"
+msgstr ""
+
+#: ../src/properties_dialog.c:85
+msgid "Name:"
+msgstr ""
+
+#: ../src/properties_dialog.c:98
+msgid "Kind:"
+msgstr ""
+
+#: ../src/properties_dialog.c:119
+msgid "Properties"
+msgstr ""
+
+#: ../libsqueeze/archive.c:268
+msgid "Name"
+msgstr ""
+
+#: ../libsqueeze/archive.c:270
+msgid "Mime type"
+msgstr ""
+
+#: ../libsqueeze/command-builder-compr.c:198
+#: ../libsqueeze/command-builder-gnu-tar.c:236
+#: ../libsqueeze/command-builder-gnu-tar.c:356
+msgid "Compressing"
+msgstr ""
+
+#: ../libsqueeze/command-builder-compr.c:222
+#: ../libsqueeze/command-builder-gnu-tar.c:269
+#: ../libsqueeze/command-builder-gnu-tar.c:347
+msgid "Decompressing"
+msgstr ""
+
+#: ../libsqueeze/command-builder-compr.c:253
#: ../libsqueeze/command-builder-gnu-tar.c:428
#: ../libsqueeze/command-builder-gnu-tar.c:430
#: ../libsqueeze/command-builder-rar.c:226
-#: ../libsqueeze/command-builder-compr.c:253
+#: ../libsqueeze/command-builder-zip.c:203
msgid "Refresh"
msgstr ""
@@ -99,18 +125,24 @@
msgid "Owner/Group"
msgstr ""
-#: ../libsqueeze/command-builder-gnu-tar.c:236
-#: ../libsqueeze/command-builder-gnu-tar.c:356
-#: ../libsqueeze/command-builder-compr.c:198
-msgid "Compressing"
+#: ../libsqueeze/command-builder-gnu-tar.c:149
+#: ../libsqueeze/command-builder-rar.c:129
+#: ../libsqueeze/command-builder-zip.c:111
+msgid "Size"
msgstr ""
-#: ../libsqueeze/command-builder-gnu-tar.c:269
-#: ../libsqueeze/command-builder-gnu-tar.c:347
-#: ../libsqueeze/command-builder-compr.c:222
-msgid "Decompressing"
+#: ../libsqueeze/command-builder-gnu-tar.c:151
+#: ../libsqueeze/command-builder-rar.c:133
+#: ../libsqueeze/command-builder-zip.c:115
+msgid "Date"
msgstr ""
+#: ../libsqueeze/command-builder-gnu-tar.c:153
+#: ../libsqueeze/command-builder-rar.c:135
+#: ../libsqueeze/command-builder-zip.c:117
+msgid "Time"
+msgstr ""
+
#: ../libsqueeze/command-builder-gnu-tar.c:283
msgid "Adding files"
msgstr ""
@@ -124,10 +156,50 @@
msgid "Removing files"
msgstr ""
+#: ../libsqueeze/command-builder-gnu-tar.c:370
+#: ../libsqueeze/command-builder-gnu-tar.c:392
+#: ../libsqueeze/command-builder-rar.c:197
+#: ../libsqueeze/command-builder-rar.c:199
+#: ../libsqueeze/command-builder-zip.c:172
+#: ../libsqueeze/command-builder-zip.c:174 ../libsqueeze/command-builder.c:147
+msgid "Removing"
+msgstr ""
+
+#: ../libsqueeze/command-builder-gnu-tar.c:413
+#: ../libsqueeze/command-builder-gnu-tar.c:415
+#: ../libsqueeze/command-builder-rar.c:216
+#: ../libsqueeze/command-builder-zip.c:192
+msgid "Extracting"
+msgstr ""
+
+#: ../libsqueeze/command-builder-rar.c:127
+#: ../libsqueeze/command-builder-zip.c:107
+msgid "Compressed"
+msgstr ""
+
+#: ../libsqueeze/command-builder-rar.c:131
+#: ../libsqueeze/command-builder-zip.c:113
+msgid "Ratio"
+msgstr ""
+
+#: ../libsqueeze/command-builder-rar.c:141
+#: ../libsqueeze/command-builder-zip.c:109
+msgid "Method"
+msgstr ""
+
#: ../libsqueeze/command-builder-rar.c:143
msgid "Version"
msgstr ""
+#: ../libsqueeze/command-builder-rar.c:181
+#: ../libsqueeze/command-builder-zip.c:155
+msgid "Adding"
+msgstr ""
+
+#: ../libsqueeze/command-builder.c:125
+msgid "Execute"
+msgstr ""
+
#: ../libsqueeze/spawn-command.c:269
#, c-format
msgid "Command exited with status %d."
@@ -145,6 +217,129 @@
msgid "Command Terminated"
msgstr ""
+#: ../squeeze.desktop.in.h:2
+msgid "Xfce archive manager"
+msgstr ""
+
+#: ../src/add_dialog.c:73
+msgid "Files and directories to add"
+msgstr ""
+
+#: ../src/add_dialog.c:74
+msgid "Options:"
+msgstr ""
+
+#: ../src/add_dialog.c:107
+msgid "Files"
+msgstr ""
+
+#: ../src/add_dialog.c:111
+msgid "Directories"
+msgstr ""
+
+#: ../src/add_dialog.c:144
+msgid "Add file(s) to archive"
+msgstr ""
+
+#. Select Files Dialog
+#: ../src/add_dialog.c:164
+msgid "Select files"
+msgstr ""
+
+#. Select Folder Dialog
+#: ../src/add_dialog.c:170
+msgid "Select folders"
+msgstr ""
+
+#.
+#. * Could not open archive (mime type not supported or file did not exist)
+#. * Should be a more specific error message.
+#.
+#: ../src/application.c:162 ../src/application.c:252
+msgid "Could not open archive, MIME-type unsupported or file did not exist"
+msgstr ""
+
+#: ../src/application.c:193 ../src/main_window.c:789 ../src/main_window.c:1170
+msgid ""
+"Squeeze cannot extract this archive type,\n"
+"the application to support this is missing."
+msgstr ""
+
+#.
+#. * Could not create archive (mime type unsupported)
+#.
+#: ../src/application.c:235
+msgid "Could not create archive, MIME-type unsupported"
+msgstr ""
+
+#: ../src/application.c:267 ../src/main_window.c:830
+msgid ""
+"Squeeze cannot add files to this archive type,\n"
+"the application to support this is missing."
+msgstr ""
+
+#: ../src/archive_store.c:249 ../src/notebook.c:179
+msgid "Show full path"
+msgstr ""
+
+#: ../src/archive_store.c:250 ../src/notebook.c:180
+msgid "Show the full path strings for each entry"
+msgstr ""
+
+#: ../src/archive_store.c:256 ../src/notebook.c:186
+msgid "Show mime icons"
+msgstr ""
+
+#: ../src/archive_store.c:257 ../src/notebook.c:187
+msgid "Show the mime type icons for each entry"
+msgstr ""
+
+#: ../src/archive_store.c:263
+msgid "Show up dir entry"
+msgstr ""
+
+#: ../src/archive_store.c:264
+msgid "Show '..' to go to the parent directory"
+msgstr ""
+
+#: ../src/archive_store.c:270 ../src/notebook.c:193
+msgid "Sort folders before files"
+msgstr ""
+
+#: ../src/archive_store.c:271 ../src/notebook.c:194
+msgid "The folders will be put at the top of the list"
+msgstr ""
+
+#: ../src/archive_store.c:277 ../src/archive_store.c:278 ../src/notebook.c:200
+#: ../src/notebook.c:201
+msgid "Sort text case sensitive"
+msgstr ""
+
+#: ../src/extract_dialog.c:76
+msgid "<b>Extract files:</b>"
+msgstr ""
+
+#: ../src/extract_dialog.c:77
+msgid "<b>Options:</b>"
+msgstr ""
+
+#: ../src/extract_dialog.c:87
+msgid "All files"
+msgstr ""
+
+#: ../src/extract_dialog.c:88
+msgid "Selected files"
+msgstr ""
+
+#: ../src/extract_dialog.c:100 ../src/main_window.c:428
+#: ../src/main_window.c:1129
+msgid "Extract"
+msgstr ""
+
+#: ../src/extract_dialog.c:110
+msgid "Extract archive"
+msgstr ""
+
#: ../src/main.c:51
msgid "[destination path]"
msgstr ""
@@ -226,11 +421,6 @@
msgid "Add"
msgstr ""
-#: ../src/main_window.c:428 ../src/main_window.c:1126
-#: ../src/extract_dialog.c:100
-msgid "Extract"
-msgstr ""
-
#: ../src/main_window.c:689
msgid "Open archive in new window"
msgstr ""
@@ -243,114 +433,87 @@
msgid "Archives"
msgstr ""
-#: ../src/main_window.c:789 ../src/main_window.c:1167 ../src/application.c:193
-msgid ""
-"Squeeze cannot extract this archive type,\n"
-"the application to support this is missing."
-msgstr ""
-
-#: ../src/main_window.c:829 ../src/application.c:267
-msgid ""
-"Squeeze cannot add files to this archive type,\n"
-"the application to support this is missing."
-msgstr ""
-
-#: ../src/main_window.c:849
+#: ../src/main_window.c:850
msgid "Are you sure you want to remove the selected files?"
msgstr ""
-#: ../src/main_window.c:862
+#: ../src/main_window.c:863
msgid ""
"Squeeze cannot remove files from this archive type,\n"
"the application to support this is missing."
msgstr ""
-#: ../src/main_window.c:909
+#: ../src/main_window.c:912
msgid ""
"Are you sure you want to cancel this operation?\n"
"This could damage the archive."
msgstr ""
-#: ../src/main_window.c:991
+#: ../src/main_window.c:994
msgid "Lead developer:"
msgstr ""
-#: ../src/main_window.c:994
+#: ../src/main_window.c:997
msgid "Contributors:"
msgstr ""
-#: ../src/main_window.c:997
+#: ../src/main_window.c:1000
msgid "Inspired by Xarchiver, written by Giuseppe Torelli"
msgstr ""
-#: ../src/main_window.c:999
+#: ../src/main_window.c:1002
msgid "Application Icon:"
msgstr ""
-#: ../src/main_window.c:1002
+#: ../src/main_window.c:1005
msgid "Add / Extract icons:"
msgstr ""
-#: ../src/main_window.c:1003
+#: ../src/main_window.c:1006
msgid "Based on the original extract icon created by Andreas Nilsson"
msgstr ""
-#: ../src/main_window.c:1010
+#: ../src/main_window.c:1013
msgid ""
"Squeeze is a lightweight and flexible archive manager for the Xfce Desktop "
"Environment"
msgstr ""
#. Translator credits as shown in the about dialog: NAME <E-MAIL> YEAR
-#: ../src/main_window.c:1018
+#: ../src/main_window.c:1021
msgid "translator-credits"
msgstr ""
-#: ../src/main_window.c:1047 ../src/main_window.c:1115
-#: ../src/main_window.c:1282
+#: ../src/main_window.c:1050 ../src/main_window.c:1118
+#: ../src/main_window.c:1285
msgid "Done"
msgstr ""
-#: ../src/main_window.c:1125
+#: ../src/main_window.c:1128
msgid "Which action do you want to perform on the selected file(s)?"
msgstr ""
-#: ../src/main_window.c:1126
+#: ../src/main_window.c:1129
msgid "Open"
msgstr ""
-#: ../src/main_window.c:1140
+#: ../src/main_window.c:1143
msgid ""
"Squeeze cannot view this file.\n"
"the application to support this is missing."
msgstr ""
-#: ../src/main_window.c:1208
+#: ../src/main_window.c:1211
msgid "Failed to open file"
msgstr ""
-#: ../src/main_window.c:1209
+#: ../src/main_window.c:1212
#, c-format
msgid ""
"'%s'\n"
"Could not be opened"
msgstr ""
-#.
-#. * Could not open archive (mime type not supported or file did not exist)
-#. * Should be a more specific error message.
-#.
-#: ../src/application.c:162 ../src/application.c:252
-msgid "Could not open archive, MIME-type unsupported or file did not exist"
-msgstr ""
-
-#.
-#. * Could not create archive (mime type unsupported)
-#.
-#: ../src/application.c:235
-msgid "Could not create archive, MIME-type unsupported"
-msgstr ""
-
#: ../src/new_dialog.c:69
msgid "Archive type:"
msgstr ""
@@ -359,60 +522,14 @@
msgid "Create new archive"
msgstr ""
-#: ../src/add_dialog.c:73
-msgid "Files and directories to add"
+#: ../src/notebook.c:207
+msgid "Rules hint"
msgstr ""
-#: ../src/add_dialog.c:74
-msgid "Options:"
+#: ../src/notebook.c:208
+msgid "Make the row background colors alternate"
msgstr ""
-#: ../src/add_dialog.c:107
-msgid "Files"
-msgstr ""
-
-#: ../src/add_dialog.c:111
-msgid "Directories"
-msgstr ""
-
-#: ../src/add_dialog.c:144
-msgid "Add file(s) to archive"
-msgstr ""
-
-#. Select Files Dialog
-#: ../src/add_dialog.c:164
-msgid "Select files"
-msgstr ""
-
-#. Select Folder Dialog
-#: ../src/add_dialog.c:170
-msgid "Select folders"
-msgstr ""
-
-#: ../src/extract_dialog.c:76
-msgid "<b>Extract files:</b>"
-msgstr ""
-
-#: ../src/extract_dialog.c:77
-msgid "<b>Options:</b>"
-msgstr ""
-
-#: ../src/extract_dialog.c:87
-msgid "All files"
-msgstr ""
-
-#: ../src/extract_dialog.c:88
-msgid "Selected files"
-msgstr ""
-
-#: ../src/extract_dialog.c:110
-msgid "Extract archive"
-msgstr ""
-
-#: ../src/tool_bar.c:167
-msgid "Location:"
-msgstr ""
-
#: ../src/path_bar.c:141
msgid "Spacing"
msgstr ""
@@ -421,55 +538,6 @@
msgid "The amount of space between the path buttons"
msgstr ""
-#: ../src/notebook.c:179 ../src/archive_store.c:249
-msgid "Show full path"
+#: ../src/tool_bar.c:167
+msgid "Location:"
msgstr ""
-
-#: ../src/notebook.c:180 ../src/archive_store.c:250
-msgid "Show the full path strings for each entry"
-msgstr ""
-
-#: ../src/notebook.c:186 ../src/archive_store.c:256
-msgid "Show mime icons"
-msgstr ""
-
-#: ../src/notebook.c:187 ../src/archive_store.c:257
-msgid "Show the mime type icons for each entry"
-msgstr ""
-
-#: ../src/notebook.c:193 ../src/archive_store.c:270
-msgid "Sort folders before files"
-msgstr ""
-
-#: ../src/notebook.c:194 ../src/archive_store.c:271
-msgid "The folders will be put at the top of the list"
-msgstr ""
-
-#: ../src/notebook.c:200 ../src/notebook.c:201 ../src/archive_store.c:277
-#: ../src/archive_store.c:278
-msgid "Sort text case sensitive"
-msgstr ""
-
-#: ../src/notebook.c:207
-msgid "Rules hint"
-msgstr ""
-
-#: ../src/notebook.c:208
-msgid "Make the row background colors alternate"
-msgstr ""
-
-#: ../src/archive_store.c:263
-msgid "Show up dir entry"
-msgstr ""
-
-#: ../src/archive_store.c:264
-msgid "Show '..' to go to the parent directory"
-msgstr ""
-
-#: ../squeeze.desktop.in.h:1
-msgid "Archive manager"
-msgstr ""
-
-#: ../squeeze.desktop.in.h:2
-msgid "Xfce archive manager"
-msgstr ""
Modified: squeeze/trunk/src/application.c
===================================================================
--- squeeze/trunk/src/application.c 2007-04-15 21:39:30 UTC (rev 25584)
+++ squeeze/trunk/src/application.c 2007-04-16 09:32:02 UTC (rev 25585)
@@ -257,6 +257,8 @@
}
}
g_signal_connect(G_OBJECT(lp_archive), "command-terminated", G_CALLBACK(cb_sq_application_archive_command_terminated), app);
+ GtkWidget *message_dialog = sq_message_dialog_new(GTK_WINDOW_TOPLEVEL, lp_archive);
+ gtk_widget_show(message_dialog);
if(!lsq_archive_add(lp_archive, files))
{
/* FIXME: show warning dialog */
Modified: squeeze/trunk/src/message_dialog.c
===================================================================
--- squeeze/trunk/src/message_dialog.c 2007-04-15 21:39:30 UTC (rev 25584)
+++ squeeze/trunk/src/message_dialog.c 2007-04-16 09:32:02 UTC (rev 25585)
@@ -123,6 +123,9 @@
}
gtk_widget_destroy(warning_dialog);
+
+
+ g_timeout_add(200, (GSourceFunc)sq_message_dialog_progressbar_pulse, dialog);
}
else
parent_class->dispose(dialog);
More information about the Xfce4-commits
mailing list