From: Pali Rohár Date: Fri, 22 Jun 2012 12:11:04 +0000 (+0200) Subject: Imported Upstream version 0.0.6 X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=056d1c9486be6ab60beb472c0b0a2d3fb5dab1fa;p=callnotify Imported Upstream version 0.0.6 --- diff --git a/debian/changelog b/debian/changelog index 49554c9..9aace72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,5 @@ -callnotify (0.0.5-1) stable; urgency=low +callnotify (0.0.6-3) stable; urgency=low - * Fixed notification disappear too quickly - * Added dependencies for python2.5-gtk and python2.5-hildon. - * Sending SMS to yourself will NOT cause a notification - * SMS correspondence in Conversation app will not cause notification, + * Added a control panel applet (settings menu) instead of the status menu GUI. - -- Omer Agmon Wed, 31 Mar 2010 14:34:55 +0000 + -- Omer Agmon Fri, 02 Apr 2010 20:09:57 +0000 diff --git a/debian/control b/debian/control index 5486108..b4aece0 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,8 @@ Build-Depends: debhelper (>= 5) Standards-Version: 3.7.2 Package: callnotify -Architecture: all -Depends: python2.5, python-osso, python-dbus, python2.5-gtk, python2.5-hildon, python2.5-gtk2, python-hildondesktop +Architecture: armel +Depends: python2.5, python-osso, python-dbus, python2.5-hildon, python2.5-gtk2, python-hildondesktop Description: Missed calls and SMS notifier. Will display a small status bar icon for missed Calls and SMS. The icon will disappear after closing the yellow notification or viewing the SMS. diff --git a/debian/copyright b/debian/copyright index dafd5af..ee96af7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ This package was py2debianized(0.5.3) by Omer Agmon on -Wed, 31 Mar 2010 14:34:55 +0000. +Fri, 02 Apr 2010 20:09:57 +0000. It was downloaded from diff --git a/debian/dirs b/debian/dirs index 04d55c1..d9728f8 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,4 +1,6 @@ +usr/lib/hildon-control-panel/ usr/lib/hildon-desktop/ usr/share/CallNotify/ -usr/share/application/hildon-status-menu/ -usr/share/applications/hildon-status-menu/ \ No newline at end of file +usr/share/applications/hildon-control-panel/ +usr/share/applications/hildon-status-menu/ +usr/share/pixmaps/ \ No newline at end of file diff --git a/debian/postinst b/debian/postinst index 7bfe1fd..c794ff3 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,4 +1,4 @@ #!/bin/sh killall -9 hildon-status-menu - sleep 2 + sleep 4 killall hildon-status-menu \ No newline at end of file diff --git a/debian/postrm b/debian/postrm index 7bfe1fd..c794ff3 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,4 +1,4 @@ #!/bin/sh killall -9 hildon-status-menu - sleep 2 + sleep 4 killall hildon-status-menu \ No newline at end of file diff --git a/debian/rules b/debian/rules index d466b90..06e3080 100755 --- a/debian/rules +++ b/debian/rules @@ -46,12 +46,8 @@ install: build #$(MAKE) DESTDIR="$(CURDIR)/debian/callnotify" install mkdir -p "$(CURDIR)/debian/callnotify" -# mkdir -p "$(CURDIR)/debian/callnotify/usr/lib/hildon-desktop/" - cp -a "src/usr/lib/hildon-desktop/CallNotify.py" "$(CURDIR)/debian/callnotify/usr/lib/hildon-desktop/CallNotify.py" - mkdir -p "$(CURDIR)/debian/callnotify/usr/lib/hildon-desktop/" - cp -a "src/usr/lib/hildon-desktop/CallNotify.pyo" "$(CURDIR)/debian/callnotify/usr/lib/hildon-desktop/CallNotify.pyo" - mkdir -p "$(CURDIR)/debian/callnotify/usr/share/applications/hildon-status-menu/" - cp -a "src/usr/share/applications/hildon-status-menu/CallNotify.desktop" "$(CURDIR)/debian/callnotify/usr/share/applications/hildon-status-menu/CallNotify.desktop" +# mkdir -p "$(CURDIR)/debian/callnotify/usr/lib/hildon-control-panel/" + cp -a "src/usr/lib/hildon-control-panel/libcallnotify.so" "$(CURDIR)/debian/callnotify/usr/lib/hildon-control-panel/libcallnotify.so" mkdir -p "$(CURDIR)/debian/callnotify/usr/share/CallNotify/" cp -a "src/usr/share/CallNotify/1.png" "$(CURDIR)/debian/callnotify/usr/share/CallNotify/1.png" mkdir -p "$(CURDIR)/debian/callnotify/usr/share/CallNotify/" @@ -70,8 +66,14 @@ install: build cp -a "src/usr/share/CallNotify/more.png" "$(CURDIR)/debian/callnotify/usr/share/CallNotify/more.png" mkdir -p "$(CURDIR)/debian/callnotify/usr/share/CallNotify/" cp -a "src/usr/share/CallNotify/sms.png" "$(CURDIR)/debian/callnotify/usr/share/CallNotify/sms.png" - mkdir -p "$(CURDIR)/debian/callnotify/usr/share/application/hildon-status-menu/" - cp -a "src/usr/share/application/hildon-status-menu/CallNotify.desktop" "$(CURDIR)/debian/callnotify/usr/share/application/hildon-status-menu/CallNotify.desktop" + mkdir -p "$(CURDIR)/debian/callnotify/usr/lib/hildon-desktop/" + cp -a "src/usr/lib/hildon-desktop/CallNotify.py" "$(CURDIR)/debian/callnotify/usr/lib/hildon-desktop/CallNotify.py" + mkdir -p "$(CURDIR)/debian/callnotify/usr/share/pixmaps/" + cp -a "src/usr/share/pixmaps/CallNotify.png" "$(CURDIR)/debian/callnotify/usr/share/pixmaps/CallNotify.png" + mkdir -p "$(CURDIR)/debian/callnotify/usr/share/applications/hildon-control-panel/" + cp -a "src/usr/share/applications/hildon-control-panel/callnotify.desktop" "$(CURDIR)/debian/callnotify/usr/share/applications/hildon-control-panel/callnotify.desktop" + mkdir -p "$(CURDIR)/debian/callnotify/usr/share/applications/hildon-status-menu/" + cp -a "src/usr/share/applications/hildon-status-menu/CallNotify.desktop" "$(CURDIR)/debian/callnotify/usr/share/applications/hildon-status-menu/CallNotify.desktop" # ====================================================== diff --git a/src/usr/lib/hildon-control-panel/libcallnotify.so b/src/usr/lib/hildon-control-panel/libcallnotify.so new file mode 100644 index 0000000..be2143f Binary files /dev/null and b/src/usr/lib/hildon-control-panel/libcallnotify.so differ diff --git a/src/usr/lib/hildon-desktop/CallNotify.py b/src/usr/lib/hildon-desktop/CallNotify.py index 6ebbabc..4fda0ab 100644 --- a/src/usr/lib/hildon-desktop/CallNotify.py +++ b/src/usr/lib/hildon-desktop/CallNotify.py @@ -46,8 +46,8 @@ class CallNotify(hildondesktop.StatusMenuItem): #atexit.register(self.cleanup) # add GUI buttons - self.addGUI() - dbg('constructor end') + # self.addGUI() + self.dbg('constructor end') def addGUI(self): # add GUI buttons @@ -339,9 +339,11 @@ class CallNotify(hildondesktop.StatusMenuItem): def show(self): self.dbg('show started') # blink the icon every 1 second - if not(self.stop) and self.visual: + if not(self.stop): + self.readConfigurationFile() self.stop = True - self.tmr_ptr = gobject.timeout_add(1000, self.blinkIcon) + if self.visual: + self.tmr_ptr = gobject.timeout_add(1000, self.blinkIcon) self.tmr_ptr2 = gobject.timeout_add(int(self.interval*1000*60), self.playSound) def blinkIcon(self): diff --git a/src/usr/lib/hildon-desktop/CallNotify.pyo b/src/usr/lib/hildon-desktop/CallNotify.pyo deleted file mode 100644 index 72633cf..0000000 Binary files a/src/usr/lib/hildon-desktop/CallNotify.pyo and /dev/null differ diff --git a/src/usr/share/application/hildon-status-menu/CallNotify.desktop b/src/usr/share/application/hildon-status-menu/CallNotify.desktop deleted file mode 100644 index 8e0f54a..0000000 --- a/src/usr/share/application/hildon-status-menu/CallNotify.desktop +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Name=CallNotify -Type=python -X-Path=CallNotify - diff --git a/src/usr/share/applications/hildon-control-panel/callnotify.desktop b/src/usr/share/applications/hildon-control-panel/callnotify.desktop new file mode 100644 index 0000000..de789ec --- /dev/null +++ b/src/usr/share/applications/hildon-control-panel/callnotify.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Vrsion=1.0 +Name=Call Notify +Comment=Settings for Call Notify application +Type=HildonControlPanelPlugin +Icon=CallNotify +X-control-panel-plugin=libcallnotify.so +Categories=Extras + diff --git a/src/usr/share/pixmaps/CallNotify.png b/src/usr/share/pixmaps/CallNotify.png new file mode 100644 index 0000000..dc8defe Binary files /dev/null and b/src/usr/share/pixmaps/CallNotify.png differ