summarylogtreecommitdiffstats
path: root/paths-in-opt.patch
diff options
context:
space:
mode:
authorScore_Under2015-09-10 22:57:02 +0100
committerScore_Under2015-09-10 22:57:02 +0100
commit61ac1770bd82976cf16964a7b4bab5f51e028737 (patch)
tree6c6fd87409ff8b7421467bb5a5adead13c71b4c6 /paths-in-opt.patch
parent42006928a89ba3b6d88b013cf1c531bb13796d7e (diff)
downloadaur-61ac1770bd82976cf16964a7b4bab5f51e028737.tar.gz
Update for v173
Diffstat (limited to 'paths-in-opt.patch')
-rw-r--r--paths-in-opt.patch17
1 files changed, 5 insertions, 12 deletions
diff --git a/paths-in-opt.patch b/paths-in-opt.patch
index 840c271562fc..46e384251469 100644
--- a/paths-in-opt.patch
+++ b/paths-in-opt.patch
@@ -1,5 +1,5 @@
diff --git a/include/ClientGUI.py b/include/ClientGUI.py
-index 1d4024f..d7e1afd 100755
+index dafef77..3e33d19 100755
--- a/include/ClientGUI.py
+++ b/include/ClientGUI.py
@@ -136,7 +136,7 @@ class FrameGUI( ClientGUICommon.FrameThatResizes ):
@@ -11,7 +11,7 @@ index 1d4024f..d7e1afd 100755
aboutinfo.SetLicense( license )
-@@ -2014,7 +2014,7 @@ The password is cleartext here but obscured in the entry dialog. Enter a blank p
+@@ -2013,7 +2013,7 @@ The password is cleartext here but obscured in the entry dialog. Enter a blank p
elif command == '8chan_board': webbrowser.open( 'http://8ch.net/hydrus/index.html' )
elif command == 'file_integrity': self._CheckFileIntegrity()
@@ -21,7 +21,7 @@ index 1d4024f..d7e1afd 100755
elif command == 'help_shortcuts': wx.MessageBox( CC.SHORTCUT_HELP )
elif command == 'import_files': self._ImportFiles()
diff --git a/include/ClientGUIDialogs.py b/include/ClientGUIDialogs.py
-index 57eb0a1..e178693 100755
+index cd0dee1..74a88ae 100755
--- a/include/ClientGUIDialogs.py
+++ b/include/ClientGUIDialogs.py
@@ -628,7 +628,7 @@ class DialogFirstStart( Dialog ):
@@ -34,7 +34,7 @@ index 57eb0a1..e178693 100755
message3 = 'When you close this dialog, the client will start its local http server. You will probably get a firewall warning.'
message4 = 'You can block it if you like, or you can allow it. It doesn\'t phone home, or expose your files to your network; it just provides another way to locally export your files.'
diff --git a/include/ClientLocalServerResources.py b/include/ClientLocalServerResources.py
-index 4d8c363..b5119b6 100644
+index 4d8c363..08c0d6c 100644
--- a/include/ClientLocalServerResources.py
+++ b/include/ClientLocalServerResources.py
@@ -242,11 +242,11 @@ class HydrusResourceCommandBooruThumbnail( HydrusResourceCommandBooru ):
@@ -54,15 +54,8 @@ index 4d8c363..b5119b6 100644
response_context = HydrusServerResources.ResponseContext( 200, path = path )
-@@ -278,4 +278,4 @@ class HydrusResourceCommandLocalThumbnail( HydrusServerResources.HydrusResourceC
-
- return response_context
-
--
-\ No newline at end of file
-+
diff --git a/include/HydrusConstants.py b/include/HydrusConstants.py
-index 0a834c4..fa0aa39 100755
+index 1709712..4411c3c 100755
--- a/include/HydrusConstants.py
+++ b/include/HydrusConstants.py
@@ -3,9 +3,9 @@ import sys