A bugfix for maemo and an extra warning

[gc-dialer] / build_script.sh

diff --git a/build_script.sh b/build_script.sh
index bd1e089..122b413 100755 (executable)
--- a/build_script.sh
+++ b/build_script.sh
@@ -43,11 +43,11 @@ cp gc_dialer/gc_dialer_26.png  $BUILD_BASE/usr/share/icons/hicolor/26x26/hildon/
 
 cp gc_dialer/gc_dialer.desktop $BUILD_BASE/usr/share/applications/hildon
 
-cp gc_dialer/gc_dialer.xml     $BUILD_BASE/usr/local/lib
+cp gc_dialer/gc_dialer.glade     $BUILD_BASE/usr/local/lib
 
 
 #Construct the program by cat-ing all the python files together
-echo "#!/usr/bin/python" > $BUILD_BASE/usr/local/bin/gc_dialer.py
+echo "#!/usr/bin/python2.5" > $BUILD_BASE/usr/local/bin/gc_dialer.py
 #echo "from __future__ import with_statement" >> $BUILD_BASE/usr/local/bin/gc_dialer.py
 cat gc_dialer/gc_dialer.py gc_dialer/gcbackend.py gc_dialer/browser_emu.py | grep -e '^import ' | sort -u >> $BUILD_BASE/usr/local/bin/gc_dialer.py
 cat gc_dialer/browser_emu.py gc_dialer/gcbackend.py gc_dialer/gc_dialer.py | grep -v 'browser_emu' | grep -v 'gcbackend' | grep -v "#!" >> $BUILD_BASE/usr/local/bin/gc_dialer.py
@@ -59,12 +59,13 @@ chmod 755 $BUILD_BASE/usr/local/bin/gc_dialer.py
 if [ "$PLATFORM" != "desktop" ]; then
        echo "  Generic Maemo Support"
        # Compress whitespace for 30% savings, make sure we are a HildonWindow
-       sed -i 's/^[ \t]*//;s/[ \t]*$//;s/GtkWindow/HildonWindow/' $BUILD_BASE/usr/local/lib/gc_dialer.xml
+       sed -i 's/^[ \t]*//;s/[ \t]*$//;s/GtkWindow/HildonWindow/' $BUILD_BASE/usr/local/lib/gc_dialer.glade
 fi
 
-if [ "$LEGACY_GLADE" = "1" ]; then
-       echo "  Legacy version of Glade"
-       sed -i 's/interface/glade-interface/;s/object/widget/' $BUILD_BASE/usr/local/lib/gc_dialer.xml
-       sed -i 's/get_object/get_widget/;s/connect_signals/signal_autoconnect/' $BUILD_BASE/usr/local/bin/gc_dialer.py
-fi
+#if [ "$LEGACY_GLADE" = "1" ]; then
+#      echo "  Legacy version of Glade"
+#      sed -i 's/interface/glade-interface/;s/object/widget/' $BUILD_BASE/usr/local/lib/gc_dialer.xml
+#      #sed -ri 's/(<property name="tab_expand">True<\/property>)/\<property name="type"\>tab\<\/property\>\1/' $BUILD_BASE/usr/local/lib/gc_dialer.xml
+#      sed -i 's/get_object/get_widget/;s/connect_signals/signal_autoconnect/' $BUILD_BASE/usr/local/bin/gc_dialer.py
+#fi