From: Pali Rohár Date: Fri, 22 Jun 2012 12:11:05 +0000 (+0200) Subject: Imported Upstream version 0.1.2 X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=aaf481cfcd51041b514ba4ba6e56d9072be7488f;hp=617e245cd948f3d3e9f3a73a757d211f6df96e25;p=callnotify Imported Upstream version 0.1.2 --- diff --git a/debian/changelog b/debian/changelog index ba6aec9..5c18991 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -callnotify (0.1.1-1) stable; urgency=low +callnotify (0.1.2-4) stable; urgency=low - * Should work now with PR1.2 + * Works with PR1.2 - -- Omer Agmon Sun, 30 May 2010 22:24:54 +0000 + -- Omer Agmon Wed, 02 Jun 2010 00:03:24 +0000 diff --git a/debian/control b/debian/control index 173bc56..3e740cd 100644 --- a/debian/control +++ b/debian/control @@ -6,12 +6,12 @@ Build-Depends: debhelper (>= 5) Standards-Version: 3.7.2 Package: callnotify -Architecture: any +Architecture: armel Depends: python2.5, python2.5-osso, python2.5-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. -XSBC-Bugtracker: XSBC-Bugtracker: test +XSBC-Bugtracker: XSBC-Bugtracker: http://talk.maemo.org/showthread.php?t=48501 XB-Maemo-Icon-26: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACx jwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAZdEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41 diff --git a/debian/copyright b/debian/copyright index 0d031ee..0c4f5ec 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ This package was py2debianized(0.5.3) by Omer Agmon on -Sun, 30 May 2010 22:24:54 +0000. +Wed, 02 Jun 2010 00:03:24 +0000. It was downloaded from diff --git a/debian/rules b/debian/rules index d31e215..9949f90 100755 --- a/debian/rules +++ b/debian/rules @@ -47,7 +47,9 @@ install: build mkdir -p "$(CURDIR)/debian/callnotify" # mkdir -p "$(CURDIR)/debian/callnotify/usr/lib/hildon-control-panel/" - cp -a "src/usr/lib/hildon-control-panel/libcallnotify.c" "$(CURDIR)/debian/callnotify/usr/lib/hildon-control-panel/libcallnotify.c" + cp -a "src/usr/lib/hildon-control-panel/libcallnotify.ao" "$(CURDIR)/debian/callnotify/usr/lib/hildon-control-panel/libcallnotify.ao" + 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/" diff --git a/src/usr/lib/hildon-control-panel/libcallnotify.ao b/src/usr/lib/hildon-control-panel/libcallnotify.ao new file mode 100644 index 0000000..9b013e3 Binary files /dev/null and b/src/usr/lib/hildon-control-panel/libcallnotify.ao differ diff --git a/src/usr/lib/hildon-control-panel/libcallnotify.c b/src/usr/lib/hildon-control-panel/libcallnotify.c deleted file mode 100755 index dc83af4..0000000 --- a/src/usr/lib/hildon-control-panel/libcallnotify.c +++ /dev/null @@ -1,137 +0,0 @@ -#include -#include -#include -#include - -osso_return_t execute(osso_context_t *osso, gpointer data, gboolean user_activated) -{ -char a = 'y'; -char b = 'y'; -char c = 'y'; -GtkWidget *dialog; -GtkWidget *btnVisual; -GtkWidget *btnVibrate; -GtkWidget *btnSound; -GtkWidget *slider; -GtkWidget *lblText; -- Show quoted text - -GtkAdjustment * adj; -gdouble sldValue = 0.0; -gdouble newValue = 0.0; -char *fileContent; -char *fileDouble; -int i; -gint response; - -/* Create dialog with OK and Cancel buttons. Leave the separator out, -* as we do not have any content. */ -dialog = gtk_dialog_new_with_buttons( -"Call Notify Settings", -GTK_WINDOW(data), -GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR, -GTK_STOCK_OK, -GTK_RESPONSE_OK, -GTK_STOCK_CANCEL, -GTK_RESPONSE_CANCEL, -NULL); - -/* ... add something to the dialog ... */ -//btnVisual = gtk_check_button_new_with_label(); -btnVisual = (GtkWidget*)hildon_check_button_new(HILDON_SIZE_FULLSCREEN_WIDTH | HILDON_SIZE_FINGER_HEIGHT); -gtk_button_set_label (GTK_BUTTON (btnVisual), "Visual Notification"); - -btnVibrate = (GtkWidget*)hildon_check_button_new(HILDON_SIZE_FULLSCREEN_WIDTH | HILDON_SIZE_FINGER_HEIGHT); -gtk_button_set_label (GTK_BUTTON (btnVibrate), "Vibrate Notification"); - -btnSound = (GtkWidget*)hildon_check_button_new(HILDON_SIZE_FULLSCREEN_WIDTH | HILDON_SIZE_FINGER_HEIGHT); -gtk_button_set_label (GTK_BUTTON (btnSound), "Sound Notification"); - -lblText = (GtkWidget*)gtk_label_new("Please select notification interval:"); - - -slider = gtk_hscale_new_with_range(0.0, 60.0, 0.1); - - -FILE *inputFilePtr = fopen("/home/user/.config/CallNotify/conf.txt", "r"); - -if (inputFilePtr != NULL) -{ - - - fgets(fileContent, 12,inputFilePtr); - - - if (fileContent[0]=='y') - hildon_check_button_set_active (GTK_BUTTON(btnVisual), TRUE); - if (fileContent[2]=='y') - hildon_check_button_set_active (GTK_BUTTON(btnVibrate) , TRUE); - if (fileContent[4]=='y') - hildon_check_button_set_active (GTK_BUTTON(btnSound), TRUE); - -(char*)strtok(fileContent, ";"); -(char*)strtok(NULL, ";"); -(char*)strtok(NULL, ";"); - -fileDouble = strtok(NULL, ";"); - -// replace , with . -for (i=0; ivbox), btnVisual); -gtk_container_add(GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), btnVibrate); -gtk_container_add(GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), btnSound); -gtk_container_add(GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), lblText); -gtk_container_add(GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), slider); - -gtk_widget_show_all(dialog); - -/* Wait until user finishes the dialog. */ -response = gtk_dialog_run(GTK_DIALOG(dialog)); - -if (response == GTK_RESPONSE_OK) -{ -/* ... do something with the dialog stuff ... */ -//FILE *f_write = -inputFilePtr = fopen("/home/user/.config/CallNotify/conf.txt", "w"); - - -a = hildon_check_button_get_active(GTK_BUTTON(btnVisual)) ? 'y' : 'n'; -b = hildon_check_button_get_active(GTK_BUTTON(btnVibrate)) ? 'y' : 'n'; -c = hildon_check_button_get_active(GTK_BUTTON(btnSound)) ? 'y' : 'n'; - -newValue = gtk_adjustment_get_value(adj); - - -fprintf(inputFilePtr, "%c;%c;%c;%.1f\n",a,b,c,newValue); - -fclose(inputFilePtr); - -} - -/* Free the dialog (and it's children) */ - -gtk_widget_destroy(GTK_WIDGET(dialog)); - -return OSSO_OK; -} - -osso_return_t save_state(osso_context_t *osso, gpointer data) -{ -/* ... save state ... */ - -return OSSO_OK; -} - - 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..900613b 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 d6c0c71..4552a8b 100755 --- a/src/usr/lib/hildon-desktop/CallNotify.py +++ b/src/usr/lib/hildon-desktop/CallNotify.py @@ -343,10 +343,10 @@ class CallNotify(hildondesktop.StatusMenuItem): cur = conn.cursor() if isSms: #Nokia changed the event number from 7 to 11 and also combined the incomming and outgoing sms's - cur.execute("select count(id) from Events where event_type_id = 11 and outgoing = 0") + cur.execute("select count(id) from Events where event_type_id = 7 and outgoing = 0") else: #Nokia changed the event from 3 to 2 - cur.execute("select count(id) from Events where event_type_id = 2") + cur.execute("select count(id) from Events where event_type_id = 3 and outgoing = 0") return cur.fetchone()[0] def show(self): @@ -400,9 +400,9 @@ hd_plugin_type = CallNotify # Uncomment from "if __name__..." to "gtk.main()" if running from CLI as: # "run-standalone.sh python CallNotify.py" -if __name__=="__main__": - gobject.type_register(hd_plugin_type) - obj = gobject.new(hd_plugin_type, plugin_id="plugid_id") - obj.show_all() - gtk.main() +#if __name__=="__main__": +# gobject.type_register(hd_plugin_type) +# obj = gobject.new(hd_plugin_type, plugin_id="plugid_id") +# obj.show_all() +# gtk.main()