linuxdcpp-team team mailing list archive
-
linuxdcpp-team team
-
Mailing list archive
-
Message #03460
[Branch ~linuxdcpp-team/linuxdcpp/trunk] Rev 409: Fix certificate generation
------------------------------------------------------------
revno: 409
fixes bug(s): https://launchpad.net/bugs/727016
committer: Steven Sheehy <steven.sheehy@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2011-03-02 18:35:48 -0600
message:
Fix certificate generation
modified:
linux/settingsdialog.cc
po/linuxdcpp.pot
--
lp:linuxdcpp
https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk
Your team LinuxDC++ Team is subscribed to branch lp:linuxdcpp.
To unsubscribe from this branch go to https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk/+edit-subscription
=== modified file 'linux/settingsdialog.cc'
--- linux/settingsdialog.cc 2011-01-16 22:49:56 +0000
+++ linux/settingsdialog.cc 2011-03-03 00:35:48 +0000
@@ -334,7 +334,11 @@
gchar *path = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fileChooser));
if (path)
{
- if (!g_str_has_suffix(path, G_DIR_SEPARATOR_S))
+ GtkFileChooserAction action = gtk_file_chooser_get_action(GTK_FILE_CHOOSER(fileChooser));
+
+ if ((action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
+ action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER) &&
+ !g_str_has_suffix(path, G_DIR_SEPARATOR_S))
{
gchar *tmp = g_strconcat(path, G_DIR_SEPARATOR_S, NULL);
g_free(path);
=== modified file 'po/linuxdcpp.pot'
--- po/linuxdcpp.pot 2011-02-08 06:21:39 +0000
+++ po/linuxdcpp.pot 2011-03-03 00:35:48 +0000
@@ -8,7 +8,7 @@
"#-#-#-#-# glade.pot #-#-#-#-#\n"
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://translations.launchpad.net/linuxdcpp\n";
-"POT-Creation-Date: 2011-02-08 00:19-0600\n"
+"POT-Creation-Date: 2011-03-01 23:52-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -19,7 +19,7 @@
"#-#-#-#-# linux.pot #-#-#-#-#\n"
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://translations.launchpad.net/linuxdcpp\n";
-"POT-Creation-Date: 2011-02-08 00:19-0600\n"
+"POT-Creation-Date: 2011-03-02 18:12-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -315,7 +315,7 @@
msgstr ""
#: glade/mainwindow.glade:216 linux/downloadqueue.cc:34
-#: linux/settingsdialog.cc:605 linux/settingsdialog.cc:617
+#: linux/settingsdialog.cc:609 linux/settingsdialog.cc:621
msgid "Download Queue"
msgstr ""
@@ -361,16 +361,16 @@
msgstr ""
#: glade/mainwindow.glade:142 glade/mainwindow.glade:361
-#: linux/favoritehubs.cc:31 linux/settingsdialog.cc:616
+#: linux/favoritehubs.cc:31 linux/settingsdialog.cc:620
msgid "Favorite Hubs"
msgstr ""
-#: glade/settingsdialog.glade:3747 linux/settingsdialog.cc:469
+#: glade/settingsdialog.glade:3747 linux/settingsdialog.cc:473
msgid "Favorite Name"
msgstr ""
#: glade/mainwindow.glade:157 glade/mainwindow.glade:374
-#: linux/favoriteusers.cc:33 linux/settingsdialog.cc:620
+#: linux/favoriteusers.cc:33 linux/settingsdialog.cc:624
msgid "Favorite Users"
msgstr ""
@@ -391,14 +391,14 @@
msgstr ""
#: glade/mainwindow.glade:231 glade/mainwindow.glade:452
-#: linux/finishedtransfers.cc:33 linux/settingsdialog.cc:603
-#: linux/settingsdialog.cc:618
+#: linux/finishedtransfers.cc:33 linux/settingsdialog.cc:607
+#: linux/settingsdialog.cc:622
msgid "Finished Downloads"
msgstr ""
#: glade/mainwindow.glade:245 glade/mainwindow.glade:465
-#: linux/finishedtransfers.cc:38 linux/settingsdialog.cc:604
-#: linux/settingsdialog.cc:619
+#: linux/finishedtransfers.cc:38 linux/settingsdialog.cc:608
+#: linux/settingsdialog.cc:623
msgid "Finished Uploads"
msgstr ""
@@ -597,7 +597,7 @@
msgstr ""
#: glade/mainwindow.glade:172 glade/mainwindow.glade:387
-#: linux/publichubs.cc:29 linux/settingsdialog.cc:615
+#: linux/publichubs.cc:29 linux/settingsdialog.cc:619
msgid "Public Hubs"
msgstr ""
@@ -642,7 +642,7 @@
msgstr ""
#: glade/mainwindow.glade:201 glade/mainwindow.glade:426 linux/search.cc:40
-#: linux/settingsdialog.cc:608
+#: linux/settingsdialog.cc:612
msgid "Search"
msgstr ""
@@ -706,7 +706,7 @@
#: glade/search.glade:62 linux/downloadqueue.cc:62
#: linux/finishedtransfers.cc:54 linux/search.cc:88
-#: linux/settingsdialog.cc:529 linux/sharebrowser.cc:71 linux/transfers.cc:55
+#: linux/settingsdialog.cc:533 linux/sharebrowser.cc:71 linux/transfers.cc:55
msgid "Size"
msgstr ""
@@ -802,7 +802,7 @@
msgid "View the saved hubs"
msgstr ""
-#: glade/settingsdialog.glade:3830 linux/settingsdialog.cc:527
+#: glade/settingsdialog.glade:3830 linux/settingsdialog.cc:531
msgid "Virtual Name"
msgstr ""
@@ -1311,11 +1311,11 @@
msgid "..."
msgstr ""
-#: linux/settingsdialog.cc:680
+#: linux/settingsdialog.cc:684
msgid "Accept custom user commands from the hub"
msgstr ""
-#: linux/settingsdialog.cc:682
+#: linux/settingsdialog.cc:686
msgid "Add finished files to the share instantly (if shared)"
msgstr ""
@@ -1331,11 +1331,11 @@
msgid "Address"
msgstr ""
-#: linux/settingsdialog.cc:745
+#: linux/settingsdialog.cc:749
msgid "Allow TLS connections to clients without a trusted certificate"
msgstr ""
-#: linux/settingsdialog.cc:744
+#: linux/settingsdialog.cc:748
msgid "Allow TLS connections to hubs without a trusted certificate"
msgstr ""
@@ -1351,27 +1351,27 @@
msgid "Auto Grant Slot"
msgstr ""
-#: linux/settingsdialog.cc:671
+#: linux/settingsdialog.cc:675
msgid "Auto-away on minimize (and back on restore)"
msgstr ""
-#: linux/settingsdialog.cc:509
+#: linux/settingsdialog.cc:513
msgid "Auto-drop slow sources for all queue items (except filelists)"
msgstr ""
+#: linux/settingsdialog.cc:680
+msgid "Automatically disconnect users who leave the hub"
+msgstr ""
+
#: linux/settingsdialog.cc:676
-msgid "Automatically disconnect users who leave the hub"
-msgstr ""
-
-#: linux/settingsdialog.cc:672
msgid "Automatically follow redirects"
msgstr ""
-#: linux/settingsdialog.cc:513
+#: linux/settingsdialog.cc:517
msgid "Automatically match queue for auto search hits"
msgstr ""
-#: linux/settingsdialog.cc:512
+#: linux/settingsdialog.cc:516
msgid "Automatically search for alternative download locations"
msgstr ""
@@ -1444,7 +1444,7 @@
msgid "CRC32 inconsistency (SFV-Check)"
msgstr ""
-#: linux/settingsdialog.cc:673
+#: linux/settingsdialog.cc:677
msgid "Clear search box after each search"
msgstr ""
@@ -1456,19 +1456,19 @@
msgid "Closing connection..."
msgstr ""
-#: linux/settingsdialog.cc:695
+#: linux/settingsdialog.cc:699
msgid "Command"
msgstr ""
-#: linux/settingsdialog.cc:920
+#: linux/settingsdialog.cc:924
msgid "Command name already exists"
msgstr ""
-#: linux/settingsdialog.cc:634
+#: linux/settingsdialog.cc:638
msgid "Confirm application exit"
msgstr ""
-#: linux/settingsdialog.cc:635
+#: linux/settingsdialog.cc:639
msgid "Confirm favorite hub removal"
msgstr ""
@@ -1514,32 +1514,32 @@
msgstr ""
#: linux/UserCommandMenu.cc:66 linux/search.cc:1573
-#: linux/settingsdialog.cc:470 linux/settingsdialog.cc:528
+#: linux/settingsdialog.cc:474 linux/settingsdialog.cc:532
#: linux/sharebrowser.cc:275
msgid "Directory"
msgstr ""
-#: linux/settingsdialog.cc:1136
+#: linux/settingsdialog.cc:1140
msgid "Directory or favorite name already exists"
msgstr ""
-#: linux/settingsdialog.cc:675
+#: linux/settingsdialog.cc:679
msgid "Don't delete file lists when exiting"
msgstr ""
-#: linux/settingsdialog.cc:516
+#: linux/settingsdialog.cc:520
msgid "Don't download files already in the queue"
msgstr ""
+#: linux/settingsdialog.cc:519
+msgid "Don't download files already in the share"
+msgstr ""
+
#: linux/settingsdialog.cc:515
-msgid "Don't download files already in the share"
-msgstr ""
-
-#: linux/settingsdialog.cc:511
msgid "Don't remove the source when auto-dropping, only disconnect"
msgstr ""
-#: linux/settingsdialog.cc:683
+#: linux/settingsdialog.cc:687
msgid "Don't send the away message to bots"
msgstr ""
@@ -1579,23 +1579,23 @@
msgid "Email"
msgstr ""
-#: linux/settingsdialog.cc:678
+#: linux/settingsdialog.cc:682
msgid "Enable automatic SFV checking"
msgstr ""
-#: linux/settingsdialog.cc:575
+#: linux/settingsdialog.cc:579
msgid "Enable desktop notifications when a download finishes"
msgstr ""
-#: linux/settingsdialog.cc:576
+#: linux/settingsdialog.cc:580
msgid "Enable desktop notifications when a private message is received"
msgstr ""
-#: linux/settingsdialog.cc:679
+#: linux/settingsdialog.cc:683
msgid "Enable safe and compressed transfers"
msgstr ""
-#: linux/settingsdialog.cc:677
+#: linux/settingsdialog.cc:681
msgid "Enable segmented downloads"
msgstr ""
@@ -1674,7 +1674,7 @@
msgid "Files: %1%"
msgstr ""
-#: linux/settingsdialog.cc:566
+#: linux/settingsdialog.cc:570
msgid "Filter kick and NMDC debug messages"
msgstr ""
@@ -1713,7 +1713,7 @@
msgid "Highest"
msgstr ""
-#: linux/search.cc:92 linux/settingsdialog.cc:606 linux/settingsdialog.cc:694
+#: linux/search.cc:92 linux/settingsdialog.cc:610 linux/settingsdialog.cc:698
msgid "Hub"
msgstr ""
@@ -1750,11 +1750,11 @@
msgid "ISO-8859-9 (Turkish)"
msgstr ""
-#: linux/settingsdialog.cc:629
+#: linux/settingsdialog.cc:633
msgid "Ignore private messages from bots"
msgstr ""
-#: linux/settingsdialog.cc:628
+#: linux/settingsdialog.cc:632
msgid "Ignore private messages from the hub"
msgstr ""
@@ -1781,7 +1781,7 @@
msgid "KOI8-R (Cyrillic)"
msgstr ""
-#: linux/settingsdialog.cc:674
+#: linux/settingsdialog.cc:678
msgid ""
"Keep duplicate files in your file list (duplicates never count towards your "
"share size)"
@@ -1828,11 +1828,11 @@
msgid "Most Recent Hub"
msgstr ""
-#: linux/favoritehubs.cc:47 linux/publichubs.cc:38 linux/settingsdialog.cc:693
+#: linux/favoritehubs.cc:47 linux/publichubs.cc:38 linux/settingsdialog.cc:697
msgid "Name"
msgstr ""
-#: linux/settingsdialog.cc:914
+#: linux/settingsdialog.cc:918
msgid "Name and command must not be empty"
msgstr ""
@@ -1840,7 +1840,7 @@
msgid "New list"
msgstr ""
-#: linux/settingsdialog.cc:1044
+#: linux/settingsdialog.cc:1048
msgid "New public hub list"
msgstr ""
@@ -1888,19 +1888,19 @@
msgid "Online"
msgstr ""
-#: linux/settingsdialog.cc:571
+#: linux/settingsdialog.cc:575
msgid "Only show joins / parts for favorite users"
msgstr ""
-#: linux/settingsdialog.cc:627
+#: linux/settingsdialog.cc:631
msgid "Open a new window when using /join"
msgstr ""
-#: linux/settingsdialog.cc:625
+#: linux/settingsdialog.cc:629
msgid "Open file list window in the background"
msgstr ""
-#: linux/settingsdialog.cc:626
+#: linux/settingsdialog.cc:630
msgid "Open new private messages from other users in the background"
msgstr ""
@@ -1931,7 +1931,7 @@
msgid "Priority"
msgstr ""
-#: linux/settingsdialog.cc:607
+#: linux/settingsdialog.cc:611
msgid "Private Message"
msgstr ""
@@ -1943,7 +1943,7 @@
msgid "Remote client does not fully support TTH - cannot download"
msgstr ""
-#: linux/settingsdialog.cc:510
+#: linux/settingsdialog.cc:514
msgid "Remove slow filelists"
msgstr ""
@@ -1989,16 +1989,16 @@
msgid "Send commands to the existing instance (if applicable)"
msgstr ""
-#: linux/settingsdialog.cc:681
+#: linux/settingsdialog.cc:685
msgid "Send unknown /commands to the hub"
msgstr ""
#. TRANSLATORS: Name of custom separator user command.
-#: linux/settingsdialog.cc:826
+#: linux/settingsdialog.cc:830
msgid "Separator"
msgstr ""
-#: linux/settingsdialog.cc:508
+#: linux/settingsdialog.cc:512
msgid "Set lowest priority for newly added files larger than low priority size"
msgstr ""
@@ -2006,11 +2006,11 @@
msgid "Shared"
msgstr ""
-#: linux/settingsdialog.cc:570
+#: linux/settingsdialog.cc:574
msgid "Show joins / parts in chat by default"
msgstr ""
-#: linux/settingsdialog.cc:567
+#: linux/settingsdialog.cc:571
msgid "Show status icon"
msgstr ""
@@ -2018,7 +2018,7 @@
msgid "Show the running instance (default action)"
msgstr ""
-#: linux/settingsdialog.cc:568
+#: linux/settingsdialog.cc:572
msgid "Show timestamps in chat by default"
msgstr ""
@@ -2033,7 +2033,7 @@
msgid "Size: %1%"
msgstr ""
-#: linux/settingsdialog.cc:514
+#: linux/settingsdialog.cc:518
msgid "Skip zero-byte files"
msgstr ""
@@ -2116,7 +2116,7 @@
msgid "Total Size: %1%"
msgstr ""
-#: linux/settingsdialog.cc:553 linux/settingsdialog.cc:1242
+#: linux/settingsdialog.cc:557 linux/settingsdialog.cc:1246
#, boost-format
msgid "Total share size: %1%"
msgstr ""
@@ -2190,19 +2190,19 @@
msgid "Uploaded %1% (%2$.1f%%)"
msgstr ""
-#: linux/settingsdialog.cc:572
+#: linux/settingsdialog.cc:576
msgid "Use OEM monospaced font for chat windows"
msgstr ""
-#: linux/settingsdialog.cc:743
+#: linux/settingsdialog.cc:747
msgid "Use TLS when remote client supports it"
msgstr ""
-#: linux/settingsdialog.cc:684
+#: linux/settingsdialog.cc:688
msgid "Use fast hashing method"
msgstr ""
-#: linux/settingsdialog.cc:573
+#: linux/settingsdialog.cc:577
msgid "Use system icons"
msgstr ""
@@ -2233,7 +2233,7 @@
msgid "Users"
msgstr ""
-#: linux/settingsdialog.cc:569
+#: linux/settingsdialog.cc:573
msgid "View status messages in main chat"
msgstr ""
