ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Ted Gould (ted)
------------------------------------------------------------
revno: 33 [merge]
committer: Ted Gould <ted@xxxxxxxx>
branch nick: trunk
timestamp: Fri 2010-02-05 15:01:40 -0800
message:
  Updating to the new libindicate
added:
  indicate/_indicate.so@
renamed:
  src/ => indicate/
modified:
  .bzrignore
  Makefile.am
  configure.ac
  indicate/indicate.defs
  tests/im-client.py


--
lp:indicator-applet/python0.2
https://code.launchpad.net/~indicator-applet-developers/indicator-applet/indicate-python

Your team ayatana-commits is subscribed to branch lp:indicator-applet/python0.2.
To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-applet/indicate-python/+edit-subscription.

=== modified file '.bzrignore'
--- .bzrignore	2009-03-19 15:49:13 +0000
+++ .bzrignore	2010-02-05 22:57:51 +0000
@@ -20,3 +20,4 @@
 .libs
 indicate-python-0.0.1.tar.gz
 indicate-python-0.1.1.tar.gz
+indicate/indicate.c

=== modified file 'Makefile.am'
--- Makefile.am	2009-04-09 14:59:27 +0000
+++ Makefile.am	2010-02-05 22:27:56 +0000
@@ -1,4 +1,4 @@
-SUBDIRS = src tests
+SUBDIRS = indicate tests
 
 EXTRA_DIST = \
 	AUTHORS NEWS INSTALL COPYING.LGPL-3 COPYING.LGPL-2.1 README \

=== modified file 'configure.ac'
--- configure.ac	2009-09-14 15:56:26 +0000
+++ configure.ac	2010-02-05 22:27:56 +0000
@@ -10,7 +10,7 @@
 AM_CONFIG_HEADER(config.h)
 
 PYGTK_REQUIRED=2.14.0
-LIBINDICATE_REQUIRED=0.2.0
+LIBINDICATE_REQUIRED=0.3.0
 PYGOBJECT_REQUIRED=0.22
 
 AM_MAINTAINER_MODE
@@ -40,7 +40,7 @@
 
 AC_CONFIG_FILES([
 Makefile
-src/Makefile
+indicate/Makefile
 tests/Makefile
 ])
 

=== renamed directory 'src' => 'indicate'
=== added symlink 'indicate/_indicate.so'
=== target is u'.libs/_indicate.so'
=== modified file 'indicate/indicate.defs'
--- src/indicate.defs	2009-09-14 18:36:15 +0000
+++ indicate/indicate.defs	2010-02-05 21:22:34 +0000
@@ -80,6 +80,9 @@
   (of-object "IndicateIndicator")
   (c-name "indicate_indicator_user_display")
   (return-type "none")
+  (parameters
+    '("guint" "timestamp")
+  )
 )
 
 (define-method set_property
@@ -244,6 +247,7 @@
   (parameters
     '("IndicateListenerServer*" "server")
     '("IndicateListenerIndicator*" "indicator")
+    '("guint" "timestamp")
   )
 )
 

=== modified file 'tests/im-client.py'
--- tests/im-client.py	2009-09-17 14:19:08 +0000
+++ tests/im-client.py	2010-02-05 22:43:57 +0000
@@ -48,10 +48,10 @@
 
     return True
 
-def display(indicator):
+def display(indicator, timestamp):
     print "Ah, my indicator has been displayed"
 
-def server_display(server):
+def server_display(server, timestamp):
     print "Ah, my server has been displayed"