Minor code and makefile cleanups

git-svn-id: file:///svnroot/gc-dialer/trunk@101 c39d3808-3fe2-4d86-a59f-b7f623ee9f21

diff --git a/Makefile b/Makefile
index c8b4408..a0e537f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,9 @@
 PROJECT_NAME=gc_dialer
-SOURCE_PATH=./gc_dialer
+SOURCE_PATH=gc_dialer
 SOURCE=$(SOURCE_PATH)/gc_dialer.py $(SOURCE_PATH)/gcbackend.py $(SOURCE_PATH)/browser_emu.py
 OBJ=$(SOURCE:.py=.pyc)
+LINT_STATS_PATH=~/.pylint.d
+LINT_STATS=$(foreach file, $(addsuffix 1.stats,$(subst /,.,$(basename $(SOURCE)))), $(LINT_STATS_PATH)/$(file) )
 TEST_PATH=./tests
 TAG_FILE=~/.ctags/$(PROJECT_NAME).tags
 PYPACKAGE_FILE=./support/GrandcentralDialer.pypackager
@@ -37,8 +39,7 @@ debug: $(SOURCE)
 test: $(SOURCE)
        cd $(SOURCE_PATH) ; ./gc_dialer.py -t
 
-lint: $(SOURCE_PATH)
-       $(foreach file, $(SOURCE_PATH), $(LINT) $(file) ; )
+lint: $(LINT_STATS)
 
 tags: $(TAG_FILE) 
 
@@ -83,6 +84,7 @@ endif
 clean:
        rm -Rf $(PACKAGE_PATH) $(BUILD_PATH)
        rm -Rf $(OBJ)
+       rm -Rf $(LINT_STATS_PATH)/*
 
 $(BUILD_BIN): $(SOURCE)
        mkdir -p $(dir $(BUILD_BIN))
@@ -98,3 +100,14 @@ $(TAG_FILE): $(SOURCE)
        mkdir -p $(dir $(TAG_FILE))
        $(CTAGS) -o $(TAG_FILE) $(SOURCE)
 
+%1.stats: $(SOURCE)
+       @ #DESIRED DEPENDENCY: $(subst .,/,$(notdir $*)).py
+       @ #DESIRED COMMAND: $(LINT) $<
+       @ $(LINT) $(subst .,/,$(notdir $*)).py
+       @# echo $*
+       @# echo $?
+
+#Makefile Debugging
+#Target to print any variable, can be added to the dependencies of any other target
+#Userfule flags for make, -d, -p, -n
+print-%: ; @$(error $* is $($*) ($(value $*)) (from $(origin $*)))

diff --git a/TODO b/TODO
index 08744d0..4c018b4 100644 (file)
--- a/TODO
+++ b/TODO
@@ -7,7 +7,6 @@ User Contacts
 
        Maybe support different backends?
                GMail http://libgmail.sourceforge.net/
-               Grand Central
                Maemo
                GPE
 

diff --git a/gc_dialer/gc_dialer.py b/gc_dialer/gc_dialer.py
index 44f64c5..48691ba 100755 (executable)
--- a/gc_dialer/gc_dialer.py
+++ b/gc_dialer/gc_dialer.py
@@ -298,6 +298,7 @@ class Dialpad(object):
                self._gcBackend = GCDialer()
 
                self._phoneTypeSelector = PhoneTypeSelector(self._widgetTree, self._gcBackend)
+
                self.attempt_login(2)
                gobject.idle_add(self._init_grandcentral)
                gobject.idle_add(self._init_recent_view)
@@ -382,9 +383,9 @@ class Dialpad(object):
                combobox.set_model(self.callbacklist)
                combobox.set_text_column(0)
                for number, description in self._gcBackend.get_callback_numbers().iteritems():
-                       self.callbacklist.append([make_pretty(number)] )
+                       self.callbacklist.append([make_pretty(number)])
 
-               self._widgetTree.get_widget("callbackcombo").get_child().set_text(make_pretty(self._gcBackend.get_callback_number()))
+               combobox.get_child().set_text(make_pretty(self._gcBackend.get_callback_number()))
                self._callbackNeedsSetup = False
 
        def populate_recentview(self):
@@ -405,7 +406,7 @@ class Dialpad(object):
                contactsview.freeze_child_notify()
                contactsview.set_model(None)
 
-        # get gc icon
+               # get gc icon
                gc_icon = gtk.gdk.pixbuf_new_from_file_at_size('gc_contact.png', 16, 16)
                for contactId, contactName in self._gcBackend.get_contacts():
                        self._contactsmodel.append((gc_icon,) + (contactName, "", contactId) + ("",))
@@ -507,6 +508,7 @@ class Dialpad(object):
                self._widgetTree.get_widget("login_dialog").response(gtk.RESPONSE_OK)
 
        def _on_loginclose_clicked(self, *args):
+               gtk.main_quit()
                sys.exit(0)
 
        def _on_clearcookies_clicked(self, *args):
@@ -628,7 +630,6 @@ def run_dialpad():
        title = 'Dialpad'
        handle = Dialpad()
        gtk.main()
-       sys.exit(0)
 
 
 class DummyOptions(object):