linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 415
fixes bug(s): https://launchpad.net/bugs/735124
committer: Razzloss <razzloss@xxxxxxxxx>
branch nick: master
timestamp: Tue 2011-03-15 06:56:58 +0200
message:
  Fix abort when G_USER_DIRECTORY_DOWNLOAD isn't set
modified:
  linux/wulfor.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/wulfor.cc'
--- linux/wulfor.cc	2011-03-08 03:52:40 +0000
+++ linux/wulfor.cc	2011-03-15 04:56:58 +0000
@@ -161,12 +161,15 @@
 {
 	CommandlineArgs args;
 
-	std::string downloadPath = g_get_user_special_dir(G_USER_DIRECTORY_DOWNLOAD);
-
+	std::string downloadPath;
 	dcpp::Util::PathsMap pathsMap;
 	pathsMap[dcpp::Util::PATH_RESOURCES] = _DATADIR;
 	pathsMap[dcpp::Util::PATH_LOCALE] = _DATADIR "/locale";
-	pathsMap[dcpp::Util::PATH_DOWNLOADS] = downloadPath + PATH_SEPARATOR_STR;
+	if (g_get_user_special_dir(G_USER_DIRECTORY_DOWNLOAD) != NULL)
+	{
+		downloadPath = g_get_user_special_dir(G_USER_DIRECTORY_DOWNLOAD);
+		pathsMap[dcpp::Util::PATH_DOWNLOADS] = downloadPath + PATH_SEPARATOR_STR;
+	}
 	dcpp::Util::initialize(pathsMap);
 
 	IntlUtil::initialize();

=== modified file 'po/linuxdcpp.pot'
--- po/linuxdcpp.pot	2011-03-08 03:52:40 +0000
+++ po/linuxdcpp.pot	2011-03-15 04:56:58 +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-03-07 18:26-0600\n"
+"POT-Creation-Date: 2011-03-15 06:45+0200\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-03-07 20:27-0600\n"
+"POT-Creation-Date: 2011-03-15 06:54+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -468,7 +468,7 @@
 msgid "Leave unchecked for default value"
 msgstr ""
 
-#: glade/mainwindow.glade:9 linux/wulfor.cc:226
+#: glade/mainwindow.glade:9 linux/wulfor.cc:229
 msgid "LinuxDC++"
 msgstr ""
 
@@ -1634,7 +1634,7 @@
 msgid "Exact Size"
 msgstr ""
 
-#: linux/wulfor.cc:192
+#: linux/wulfor.cc:195
 #, boost-format
 msgid "Failed to communicate with existing instance: %1%"
 msgstr ""
@@ -1877,7 +1877,7 @@
 msgid "No matches"
 msgstr ""
 
-#: linux/wulfor.cc:214
+#: linux/wulfor.cc:217
 msgid "No running instance found"
 msgstr ""
 
@@ -2151,7 +2151,7 @@
 msgid "UTF-8 (Unicode)"
 msgstr ""
 
-#: linux/wulfor.cc:200
+#: linux/wulfor.cc:203
 msgid ""
 "Unable to communicate with existing instance and only one instance is "
 "allowed per profile."