Merge lp:~bfiller/indicators-client/populate-messaging-menu-example into lp:indicators-client

[Bill Filler]

update the test script to populate the messaging menu

update the test script to populate the messaging menu

Unmerged revisions

215. By Bill Filler on 2013-08-30

update to work with new phone-apps and not depend on avatar images

=== modified file 'examples/chewie_messaging_populate_menu'
--- examples/chewie_messaging_populate_menu	2013-03-21 02:11:42 +0000
+++ examples/chewie_messaging_populate_menu	2013-08-30 20:30:57 +0000
@@ -58,15 +58,10 @@
   print 'email activted %s - %s -%s' % (msg.get_id(), action, param)
   return True
 
-def skype_activated(msg, action, param):
-  print 'skype activated %s - %s -%s' % (msg.get_id(), action, param)
-  return True
-
-
-textMsg = MessagingMenu.App(desktop_id='phone-app-sms.desktop')
+textMsg = MessagingMenu.App(desktop_id='messaging-app.desktop')
 textMsg.register()
 
-phoneCall = MessagingMenu.App(desktop_id='phone-app-phone.desktop')
+phoneCall = MessagingMenu.App(desktop_id='dialer-app.desktop')
 phoneCall.register()
 
 facebook = MessagingMenu.App(desktop_id='facebook-webapp.desktop')
@@ -75,14 +70,10 @@
 email = MessagingMenu.App(desktop_id='gmail-webapp.desktop')
 email.register()
 
-skype = MessagingMenu.App(desktop_id='skype-webapp.desktop')
-skype.register()
-
 TEXT_MSG = [ textMsg, sms_activated]
 PHONE_CALL = [ phoneCall, call_activated]
 FACEBOOK_MSG = [ facebook, facebook_activated]
 EMAIL_MSG = [ email, email_activated]
-SKYPE_MSG = [skype, skype_activated]
 
 the_messages = [
     {
@@ -126,17 +117,6 @@
         'actions' : [ ('send', 'Send', GLib.VariantType.new ('s'), None) ],
         },
     {
-        'type' : SKYPE_MSG,
-        'title' : 'Lisette Slegers',
-        'subject' : 'Lisette',
-        'body' : "See you tomorrow. XOX",
-        'icon' : IMAGE_PREFIX + 'lisette_slegers.jpg',
-        'dayOffset' : -2 ,
-        'time' : "17:25",
-        'actions' : [ ('send', 'Send', GLib.VariantType.new ('s'), None) ],
-        },
-
-    {
         'type' : FACEBOOK_MSG,
         'title': 'Florian Boucault',
         'subject': '',
@@ -147,16 +127,6 @@
         'actions' : [ ('send', 'Send', GLib.VariantType.new ('s'), None) ],
         },
     {
-        'type' : SKYPE_MSG,
-        'title': 'Tiago Salem Herrman',
-        'subject': 'Tiago',
-        'body' : "Call me when you are available",
-        'icon' : IMAGE_PREFIX + 'tiago.jpg',
-        'dayOffset' : -2 ,
-        'time' : "18:09",
-        'actions' : [ ('send', 'Send', GLib.VariantType.new ('s'), None) ],
-        },
-    {
         'type' : EMAIL_MSG,
         'title': 'Katie Taylor',
         'subject': 'Dinner with Mara',
@@ -167,16 +137,6 @@
         'actions' : [ ('send', 'Send', GLib.VariantType.new ('s'), None) ],
         },
     {
-        'type' : SKYPE_MSG,
-        'title': 'Lisette Slegers',
-        'subject': 'Lisette',
-        'body' : '1 missed call',
-        'icon' : IMAGE_PREFIX + 'lisette_slegers.jpg',
-        'dayOffset' : -2 ,
-        'time' : "20:17",
-        'actions' : [ ('call', 'Call back', None, None), ('message', 'Send', GLib.VariantType.new ('s'), predefined_messages) ],
-        },
-    {
         'type' : FACEBOOK_MSG,
         'title' : 'Ricardo Mendoza',
         'subject' : '',
@@ -216,16 +176,6 @@
         'time' : "12:03",
         'actions' : [ ('send', 'Send', GLib.VariantType.new ('s'), None) ],
         },
-    {
-        'type' : SKYPE_MSG,
-        'title': 'Bill Filler',
-        'subject': 'bill_filler',
-        'body' : '1 missed call',
-        'icon' : IMAGE_PREFIX + 'bfiller.jpg',
-        'dayOffset' : -1 ,
-        'time' : "17:47",
-        'actions' : [ ('call', 'Call back', None, None), ('message', 'Send', GLib.VariantType.new ('s'), predefined_messages) ],
-        },
     ]
 
 def run_phone_app():
@@ -241,7 +191,8 @@
     current = GLib.DateTime.new_now_local();
     for (i, m) in enumerate(the_messages, start=1):
         msgType = m['type'];
-        msg = MessagingMenu.Message.new('msg-%d' % i, Gio.Icon.new_for_string(m['icon']), m['title'], m['subject'], m['body'], calculate_date(current, m['dayOffset'], m['time']))
+#        msg = MessagingMenu.Message.new('msg-%d' % i, Gio.Icon.new_for_string(m['icon']), m['title'], m['subject'], m['body'], calculate_date(current, m['dayOffset'], m['time']))
+        msg = MessagingMenu.Message.new('msg-%d' % i, None, m['title'], m['subject'], m['body'], calculate_date(current, m['dayOffset'], m['time']))
         msg.connect('activate', msgType[1])
         for act in m['actions']:
             msg.add_action(act[0], act[1], act[2], act[3])