Merge branch 'master' into qt
authorEd Page <eopage@byu.net>
Wed, 1 Dec 2010 03:26:45 +0000 (21:26 -0600)
committerEd Page <eopage@byu.net>
Wed, 1 Dec 2010 03:26:45 +0000 (21:26 -0600)
src/backends/gvoice/gvoice.py
support/builddeb.py
www/.htaccess [new file with mode: 0644]
www/download.html
www/index.html
www/screenshots.html

index 4f201fe..d07db82 100755 (executable)
@@ -507,7 +507,8 @@ class GVoiceBackend(object):
                        "exportType": "ALL",
                        "out": "OUTLOOK_CSV",
                }
-               contacts = self._get_page(self._CSV_CONTACTS_URL, data)
+               encodedData = urllib.urlencode(data)
+               contacts = self._get_page(self._CSV_CONTACTS_URL+"?"+encodedData)
                return contacts
 
        def get_voicemails(self):
index 8ddb30c..f800cc6 100755 (executable)
@@ -43,7 +43,7 @@ rm -f ~/.%(name)s/notifier.log
 
 __preremove__ = """#!/bin/sh -e
 
-python /usr/lib/dialcentral/alarm_handler.py -d || true
+python /opt/dialcentral/lib/alarm_handler.py -d || true
 """
 
 
diff --git a/www/.htaccess b/www/.htaccess
new file mode 100644 (file)
index 0000000..a0d97e5
--- /dev/null
@@ -0,0 +1,7 @@
+Redirect permanent /index.html http://wiki.maemo.org/Dialcentral
+Redirect 301 /index.html http://wiki.maemo.org/Dialcentral
+Redirect permanent /download.html http://wiki.maemo.org/Dialcentral
+Redirect 301 /download.html http://wiki.maemo.org/Dialcentral
+Redirect permanent /screenshots.html http://wiki.maemo.org/Dialcentral
+Redirect 301 /screenshots.html http://wiki.maemo.org/Dialcentral
+
index af76fb4..01f0d8d 100644 (file)
@@ -1,39 +1,9 @@
 <html>
        <head>
-               <title>DialCentral - An Interface for GoogleVoice</title>
+               <meta http-equiv="Refresh" content="0; url=http://wiki.maemo.org/Dialcentral" />
        </head>
        <body>
-               <h1>
-                       DialCentral
-               </h1>
-               <h2>An Interface for GoogleVoice</h2>
-               <h3><a href="index.html">[About]</a> <a href="screenshots.html">[Screenshots]</a> <a href="download.html">[Download]</a>
-               <h3>Download</h3>
-
-               <h4>Packages</h4>
-               <p>Maemo 5 and Later: Go to the application installer, enable Extras, and download Dialcentral (Note: technically its still in extras-testing because people haven't been reviewing it)</p>
-
-               <p>Maemo 4.1 and Earlier: Add the <a href="http://wiki.maemo.org/Extras">Extras Repository</a> and check the App Manager for DialCentral</p>
-
-               <p>Linux: <a href="dialcentral.deb">.deb files</a></p>
-
-               <h3>Development</h3>
-               <h4>Source</h4>
-               <p>For the most up to date version check out <a href="https://garage.maemo.org/scm/?group_id=657">git</a>.
-               </p>
-               <p>Requires</p>
-               <ul>
-                       <li>PyGTK / Glade</li>
-                       <li>Python bindings for hildon, osso, dbus, and conic</li>
-               </ul>
-
-               <h4>Bugs</h4>
-
-               <p>Discuss your issue on <a href="http://talk.maemo.org/showthread.php?p=293533">Maemo.Org Talk</a></p>
-
-               <p>Check out a list of helpful <a href="http://talk.maemo.org/showpost.php?p=293533&postcount=1">troubleshooting tips</a></p>
-
-               <p>File a <a href="https://bugs.maemo.org/enter_bug.cgi?product=Dialcentral">bug report</a> against Extras-&gt;Dialcentral</p>
-               <p>View  <a href="https://bugs.maemo.org/buglist.cgi?query_format=specific&order=relevance+desc&bug_status=__open__&product=Dialcentral&content=">existing bug reports</a></p>
+               <p>Please follow <a href="http://wiki.maemo.org/Dialcentral">link</a>!</p>
        </body>
 </html>
+
index e104e24..01f0d8d 100644 (file)
@@ -1,53 +1,9 @@
 <html>
        <head>
-               <title>DialCentral - An Interface for GoogleVoice</title>
+               <meta http-equiv="Refresh" content="0; url=http://wiki.maemo.org/Dialcentral" />
        </head>
        <body>
-               <h1>
-                       DialCentral
-               </h1>
-               <h2>An Interface for GoogleVoice</h2>
-
-               <h3><a href="">[About]</a> <a href="screenshots.html">[Screenshots]</a> <a href="download.html">[Download]</a>
-
-               <h3>About</h3>
-               <p>
-               DialCentral (formerly called GC Dialer) is meant as an interface to Google's GoogleVoice service that integrates with your Maemo device or Linux computer.
-               </p>
-
-
-               <p>DialCentral has been tested on Maemo 5, Maemo 4.1, Ubuntu 9.04, and Mer 0.16-testing5.  Go check out some <a href="http://maemo.org/downloads/product/OS2008/dialcentral/">reviews</a> (just don't use that old download link) or join the <a href="http://talk.maemo.org/showthread.php?p=293533">conversation</a></p>
-
-               <p>DialCentral is Free Software and available under the <a href="http://www.gnu.org/licenses/lgpl-2.1.html">LGPLv2.1</a>.
-
-               <h4>Features</h4>
-
-               <p>DialCentral v1.0.8-5 (See <a href="http://talk.maemo.org/showthread.php?p=293533">Maemo.Org Talk</a>)</p>
-
-               <ul>
-                       <li>Dialpad interface to click-to-call</li>
-                       <li>Ability to send SMS messages through GoogleVoice</li>
-                       <li>Recent calls list for easily calling people back</li>
-                       <li>History of voicemail transcripts and SMS conversations</li>
-                       <li>Contacts list, pulling from GoogleVoice and CSV Files (like GrandCentral and GoogleContact exports)</li>
-                       <li>Recent Call history, voicemail, and SMS notification (Maemo 4.1 only)</li>
-                       <li>Shortcuts:
-                       <ul>
-                               <li>Hold down any tab to force it to refresh</li>
-                               <li>Dialpad: hold down the back button to change it to clear</li>
-                               <li>Ctrl+c from SMS Dialog to copy message history</li>
-                               <li>Ctrl+v on dialpad to paste a number</li>
-                               <li>Ctrl+l to copy the debug log</li>
-                               <li>Ctrl+enter to toggle fullscreen</li>
-                               </ul>
-                       </li>
-               </ul>
-
-               <h4>Sample Screenshot:</h4>
-               <div>
-                       <p>Dialcentral 1.0.7 on Startup (Maemo): </p>
-                       <p><img src="./images/Dialcentral - Dialpad - 1.0.7-12 Fremantle.png" alt="Screenshot of DialCentral v1.0.7's Dialpad on Maemo 5"/></p>
-               </div>
-
+               <p>Please follow <a href="http://wiki.maemo.org/Dialcentral">link</a>!</p>
        </body>
 </html>
+
index 2b8fe09..01f0d8d 100644 (file)
@@ -1,65 +1,9 @@
 <html>
        <head>
-               <title>DialCentral - An Interface for GoogleVoice</title>
+               <meta http-equiv="Refresh" content="0; url=http://wiki.maemo.org/Dialcentral" />
        </head>
        <body>
-               <h1>
-                       DialCentral
-               </h1>
-               <h2>An Interface for GoogleVoice</h2>
-               <h3><a href="index.html">[About]</a> <a href="screenshots.html">[Screenshots]</a> <a href="download.html">[Download]</a>
-
-               <h3>Screen shots</h3>
-
-               <div>
-                       <p>Dialcentral 1.0.7 on Startup (Maemo): </p>
-                       <p><img src="./images/Dialcentral - Dialpad - 1.0.7-12 Fremantle.png" alt="Screenshot of DialCentral v1.0.7's Dialpad on Maemo 5"/></p>
-               </div>
-
-               <div>
-                       <p>Dialcentral 1.0.7's list of recent call activity (Maemo): </p>
-                       <p><img src="./images/Dialcentral - Recent - 1.0.7-12 Fremantle.png" alt="Screenshot of DialCentral v1.0.7's List of Recent Call Activity on Maemo 5"/></p>
-               </div>
-
-               <div>
-                       <p>Dialcentral 1.0.7's responding to recent call activity (Maemo):</p>
-                       <p><img src="./images/Dialcentral - Recent Response - 1.0.7-12 Fremantle.png" alt="Screenshot of DialCentral v1.0.7's Responding to a piece of Recent Activity on Maemo 5"/></p>
-               </div>
-
-               <div>
-                       <p>Dialcentral 1.0.7's list of recent messages (Maemo):</p>
-                       <p><img src="./images/Dialcentral - Messages - 1.0.7-12 Fremantle.png" alt="Screenshot of DialCentral v1.0.7's List of Recent Messages on Maemo 5"/></p>
-               </div>
-
-               <div>
-                       <p>Dialcentral 1.0.7's responding to a recent message (Maemo):</p>
-                       <p><img src="./images/Dialcentral - Messages Response Start - 1.0.7-12 Fremantle.png" alt="Screenshot of DialCentral v1.0.7's Responding to a recent message on Maemo 5"/></p>
-               </div>
-
-               <div>
-                       <p>Dialcentral 1.0.7's responding to a recent message and scrolling down for some status or changing the number we are responding to (Maemo):</p>
-                       <p><img src="./images/Dialcentral - Messages Response Down - 1.0.7-12 Fremantle.png" alt="Screenshot of DialCentral v1.0.7's Responding to a recent message on Maemo 5"/></p>
-               </div>
-
-               <div>
-                       <p>Dialcentral 1.0.7's responding to a recent message and scrolling up to see more history (Maemo):</p>
-                       <p><img src="./images/Dialcentral - Messages Response Up - 1.0.7-12 Fremantle.png" alt="Screenshot of DialCentral v1.0.7's Responding to a recent message on Maemo 5"/></p>
-               </div>
-
-               <div>
-                       <p>Dialcentral 1.0.7's list of contacts (Maemo):</p>
-                       <p><img src="./images/Dialcentral - Contacts - 1.0.7-12 Fremantle.png" alt="Screenshot of DialCentral v1.0.7's List of Contacts on Maemo 5"/></p>
-               </div>
-
-               <div>
-                       <p>Dialcentral 1.0.7's choice for which number for a contact(Maemo):</p>
-                       <p><img src="./images/Dialcentral - Contacts Phone Select - 1.0.7-12 Fremantle.png" alt="Screenshot of DialCentral v1.0.7's Choosing which number to use for a contact Maemo 5"/></p>
-               </div>
-
-               <div>
-                       <p>Dialcentral 1.0.7's calling a contact (Maemo):</p>
-                       <p><img src="./images/Dialcentral - Contacts Response - 1.0.7-12 Fremantle.png" alt="Screenshot of DialCentral v1.0.7's Calling a contact Maemo 5"/></p>
-               </div>
-
+               <p>Please follow <a href="http://wiki.maemo.org/Dialcentral">link</a>!</p>
        </body>
 </html>
+