I have made the following changes intended for : CE:MW:Shared / commhistory-daemon
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/7384 Thank You, vesuri [This message was auto-generated] --- Request # 7384: Messages from BOSS: State: review at 2012-11-15T17:23:31 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:vesuri:branches:CE:MW:Shared / commhistory-daemon -> CE:MW:Shared / commhistory-daemon changes files: -------------- --- commhistory-daemon.changes +++ commhistory-daemon.changes @@ -0,0 +1,3 @@ +* Thu Nov 15 2012 Vesa Halttunen <[email protected]> - 0.4.2 +- Use new lock screen icon IDs for notifications + old: ---- commhistory-daemon-0.4.1.tar.bz2 new: ---- commhistory-daemon-0.4.2.tar.bz2 spec files: ----------- --- commhistory-daemon.spec +++ commhistory-daemon.spec @@ -1,6 +1,6 @@ Name: commhistory-daemon Summary: Communications event history database daemon -Version: 0.4.1 +Version: 0.4.2 Release: 1 Group: Communications/Telephony and IM License: LGPL @@ -51,7 +51,7 @@ %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.CommHistory.service %{_datadir}/l10n/meegotouch/commhistoryd.qm %{_datadir}/doc/commhistory-daemon-l10n-engineering-english/commhistoryd.ts -%{_datadir}/meegotouch/notifications/eventtypes/* +%{_datadir}/lipstick/notificationcategories/* %{_datadir}/telepathy/clients/CommHistory.client #files tests other changes: -------------- ++++++ commhistory-daemon-0.4.1.tar.bz2 -> commhistory-daemon-0.4.2.tar.bz2 --- .gitignore +++ .gitignore @@ -1,27 +0,0 @@ -*.o -*~ -moc_* -commhistoryd -tests/commhistorytest -Makefile -*.pro.user* -.cproject -.project -*.pyc -build-stamp -builddir/ -configure-stamp -debian/commhistory-daemon-dbg/ -debian/commhistory-daemon-l10n-engineering-english/ -debian/commhistory-daemon-tests.substvars -debian/commhistory-daemon-tests/ -debian/commhistory-daemon.substvars -debian/commhistory-daemon/ -debian/files -debian/tmp/ -src/TpExtensions/.gen/ -tests/bin/ -translations/telephony/telephony.qm -translations/messaging/messaging.qm -translations/commhistoryd.qm -translations/commhistoryd.ts --- common-vars.pri +++ common-vars.pri @@ -33,7 +33,7 @@ # Project version # remember to update debian/* files if you changes this # ----------------------------------------------------------------------------- -PROJECT_VERSION = 0.0.26 +PROJECT_VERSION = 0.4.2 # ----------------------------------------------------------------------------- # Project's data directories --- data/notifications/x-nemo.call.missed.conf +++ data/notifications/x-nemo.call.missed.conf @@ -0,0 +1,9 @@ +x-nemo-icon=icon-lock-missed-call +x-nemo-preview-icon=icon-s-status-call-missed +feedbackId=default +persistent=true +genericTextId=qtn_call_missed +genericTextCatalogue=telephony +priority=100 +lowPowerModeIconId=icon-m-low-power-mode-missed-call +statusAreaIconId=icon-s-status-notifier-call-missed --- data/notifications/x-nemo.messaging.authorizationrequest.conf +++ data/notifications/x-nemo.messaging.authorizationrequest.conf @@ -0,0 +1,10 @@ +x-nemo-icon=icon-lock-invitation +x-nemo-preview-icon=icon-s-status-invitation-pending +feedbackId=default +persistent=true +userRemovable=false +genericTextId=qtn_pers_authorization_req +genericTextCatalogue=presence +priority=30 +lowPowerModeIconId=icon-m-low-power-mode-invitation-pending +statusAreaIconId=icon-s-status-notifier-invitation-pending --- data/notifications/x-nemo.messaging.error.conf +++ data/notifications/x-nemo.messaging.error.conf @@ -0,0 +1,3 @@ +urgency=3 +userRemovable=true +persistent=false --- data/notifications/x-nemo.messaging.error.strong.conf +++ data/notifications/x-nemo.messaging.error.strong.conf @@ -0,0 +1,4 @@ +urgency=3 +userRemovable=true +persistent=false +feedbackId=warning_strong --- data/notifications/x-nemo.messaging.im.conf +++ data/notifications/x-nemo.messaging.im.conf @@ -0,0 +1,8 @@ +x-nemo-icon=icon-lock-chat +x-nemo-preview-icon=icon-s-status-chat +feedbackId=chat +genericTextId=qtn_msg_notification_new_message +genericTextCatalogue=messaging +priority=60 +lowPowerModeIconId=icon-m-low-power-mode-chat +statusAreaIconId=icon-s-status-notifier-chat --- data/notifications/x-nemo.messaging.mms.conf +++ data/notifications/x-nemo.messaging.mms.conf @@ -0,0 +1,9 @@ +x-nemo-icon=icon-lock-mms +x-nemo-preview-icon=icon-s-status-mms +persistent=true +feedbackId=sms +genericTextId=qtn_msg_notification_new_message +genericTextCatalogue=messaging +priority=80 +lowPowerModeIconId=icon-m-low-power-mode-mms +statusAreaIconId=icon-s-status-notifier-mms --- data/notifications/x-nemo.messaging.sms.conf +++ data/notifications/x-nemo.messaging.sms.conf @@ -0,0 +1,9 @@ +x-nemo-icon=icon-lock-sms +x-nemo-preview-icon=icon-s-status-sms +persistent=true +feedbackId=sms +genericTextId=qtn_msg_notification_new_message +genericTextCatalogue=messaging +priority=70 +lowPowerModeIconId=icon-m-low-power-mode-sms +statusAreaIconId=icon-s-status-notifier-sms --- data/notifications/x-nemo.messaging.voicemail-SMS.conf +++ data/notifications/x-nemo.messaging.voicemail-SMS.conf @@ -0,0 +1,10 @@ +x-nemo-icon=icon-lock-voicemail +x-nemo-preview-icon=icon-s-status-voicemail +lowPowerModeIconId=icon-m-low-power-mode-voicemail +statusAreaIconId=icon-s-status-notifier-voicemail +priority=75 +userRemovable=true +persistent=true +feedbackId=sms +genericTextId=qtn_msg_notification_new_voicemail +genericTextCatalogue=messaging --- data/notifications/x-nemo.messaging.voicemail.conf +++ data/notifications/x-nemo.messaging.voicemail.conf @@ -0,0 +1,10 @@ +x-nemo-icon=icon-lock-voicemail +x-nemo-preview-icon=icon-s-status-voicemail +userRemovable=false +persistent=true +feedbackId=sms +genericTextId=qtn_call_voicemail_notification +genericTextCatalogue=telephony +priority=90 +lowPowerModeIconId=icon-m-low-power-mode-voicemail +statusAreaIconId=icon-s-status-notifier-voicemail --- data/notifications/x-nokia.call.missed.conf +++ data/notifications/x-nokia.call.missed.conf @@ -1,9 +0,0 @@ -iconId=icon-m-telephony-callhistory-missed-inverse -previewIconId=icon-s-status-call-missed -feedbackId=default -persistent=true -genericTextId=qtn_call_missed -genericTextCatalogue=telephony -priority=100 -lowPowerModeIconId=icon-m-low-power-mode-missed-call -statusAreaIconId=icon-s-status-notifier-call-missed --- data/notifications/x-nokia.messaging.authorizationrequest.conf +++ data/notifications/x-nokia.messaging.authorizationrequest.conf @@ -1,10 +0,0 @@ -iconId=icon-m-content-invitation-pending-inverse -previewIconId=icon-s-status-invitation-pending -feedbackId=default -persistent=true -userRemovable=false -genericTextId=qtn_pers_authorization_req -genericTextCatalogue=presence -priority=30 -lowPowerModeIconId=icon-m-low-power-mode-invitation-pending -statusAreaIconId=icon-s-status-notifier-invitation-pending --- data/notifications/x-nokia.messaging.error.conf +++ data/notifications/x-nokia.messaging.error.conf @@ -1,3 +0,0 @@ -class=system -userRemovable=true -persistent=false --- data/notifications/x-nokia.messaging.error.strong.conf +++ data/notifications/x-nokia.messaging.error.strong.conf @@ -1,4 +0,0 @@ -class=system -userRemovable=true -persistent=false -feedbackId=warning_strong --- data/notifications/x-nokia.messaging.im.conf +++ data/notifications/x-nokia.messaging.im.conf @@ -1,8 +0,0 @@ -iconId=icon-m-content-chat-inverse -previewIconId=icon-s-status-chat -feedbackId=chat -genericTextId=qtn_msg_notification_new_message -genericTextCatalogue=messaging -priority=60 -lowPowerModeIconId=icon-m-low-power-mode-chat -statusAreaIconId=icon-s-status-notifier-chat --- data/notifications/x-nokia.messaging.mms.conf +++ data/notifications/x-nokia.messaging.mms.conf @@ -1,9 +0,0 @@ -iconId=icon-m-content-mms-inverse -previewIconId=icon-s-status-mms -persistent=true -feedbackId=sms -genericTextId=qtn_msg_notification_new_message -genericTextCatalogue=messaging -priority=80 -lowPowerModeIconId=icon-m-low-power-mode-mms -statusAreaIconId=icon-s-status-notifier-mms --- data/notifications/x-nokia.messaging.sms.conf +++ data/notifications/x-nokia.messaging.sms.conf @@ -1,9 +0,0 @@ -iconId=icon-m-content-sms-inverse -previewIconId=icon-s-status-sms -persistent=true -feedbackId=sms -genericTextId=qtn_msg_notification_new_message -genericTextCatalogue=messaging -priority=70 -lowPowerModeIconId=icon-m-low-power-mode-sms -statusAreaIconId=icon-s-status-notifier-sms --- data/notifications/x-nokia.messaging.voicemail-SMS.conf +++ data/notifications/x-nokia.messaging.voicemail-SMS.conf @@ -1,10 +0,0 @@ -iconId=icon-m-content-voicemail-inverse -previewIconId=icon-s-status-voicemail -lowPowerModeIconId=icon-m-low-power-mode-voicemail -statusAreaIconId=icon-s-status-notifier-voicemail -priority=75 -userRemovable=true -persistent=true -feedbackId=sms -genericTextId=qtn_msg_notification_new_voicemail -genericTextCatalogue=messaging --- data/notifications/x-nokia.messaging.voicemail.conf +++ data/notifications/x-nokia.messaging.voicemail.conf @@ -1,10 +0,0 @@ -iconId=icon-m-content-voicemail-inverse -previewIconId=icon-s-status-voicemail -userRemovable=false -persistent=true -feedbackId=sms -genericTextId=qtn_call_voicemail_notification -genericTextCatalogue=telephony -priority=90 -lowPowerModeIconId=icon-m-low-power-mode-voicemail -statusAreaIconId=icon-s-status-notifier-voicemail --- src/constants.h +++ src/constants.h @@ -111,12 +111,12 @@ static const EventTypes _eventTypes[] = { - {CommHistory::Event::IMEvent, "x-nokia.messaging.im"}, - {CommHistory::Event::SMSEvent, "x-nokia.messaging.sms"}, - {CommHistory::Event::MMSEvent, "x-nokia.messaging.mms"}, - {CommHistory::Event::CallEvent, "x-nokia.call.missed"}, - {CommHistory::Event::VoicemailEvent,"x-nokia.messaging.voicemail"}, - {VOICEMAIL_SMS_EVENT_TYPE, "x-nokia.messaging.voicemail-SMS"} + {CommHistory::Event::IMEvent, "x-nemo.messaging.im"}, + {CommHistory::Event::SMSEvent, "x-nemo.messaging.sms"}, + {CommHistory::Event::MMSEvent, "x-nemo.messaging.mms"}, + {CommHistory::Event::CallEvent, "x-nemo.call.missed"}, + {CommHistory::Event::VoicemailEvent,"x-nemo.messaging.voicemail"}, + {VOICEMAIL_SMS_EVENT_TYPE, "x-nemo.messaging.voicemail-SMS"} }; static const int _eventTypesCount = sizeof(_eventTypes) / sizeof(EventTypes); @@ -124,7 +124,7 @@ // Custom system info banner types for commhistoryd: typedef QString BannerType; -const BannerType ErrorBanner = "x-nokia.messaging.error"; -const BannerType ErrorBannerStrong = "x-nokia.messaging.error.strong"; +const BannerType ErrorBanner = "x-nemo.messaging.error"; +const BannerType ErrorBannerStrong = "x-nemo.messaging.error.strong"; #endif //#define CONSTANTS_H --- src/contactauthorizer.cpp +++ src/contactauthorizer.cpp @@ -42,7 +42,7 @@ #include <TelepathyQt/Contact> // constants -static const char* AuthorizationNotificationType = "x-nokia.messaging.authorizationrequest"; +static const char* AuthorizationNotificationType = "x-nemo.messaging.authorizationrequest"; #define OBJECT_PATH QLatin1String("/") #define BUDDY_AUTHORIZER_SERVICE_NAME QLatin1String("com.nokia.buddyauthorizer-service") --- src/src.pro +++ src/src.pro @@ -203,6 +203,6 @@ # ----------------------------------------------------------------------------- # Installation target for application resources # ----------------------------------------------------------------------------- -notification_types.path = $${INSTALL_PREFIX}/share/meegotouch/notifications/eventtypes +notification_types.path = $${INSTALL_PREFIX}/share/lipstick/notificationcategories notification_types.files = $${_PRO_FILE_PWD_}/../data/notifications/*.conf INSTALLS += notification_types
