Merge lp:~artfwo/libappindicator/ubuntu into lp:~ubuntu-desktop/libappindicator/ubuntu

[Artem Popov]

[lp:~artfwo/libappindicator/ubuntu]

261. By Artem Popov on 2011-02-28

Really add update-defs.patch

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-28 13:58:38 +0000
+++ debian/changelog	2011-02-28 17:06:23 +0000
@@ -1,3 +1,10 @@
+libappindicator (0.2.96-0ubuntu3) natty; urgency=low
+
+  * debian/patches/update-defs.patch:
+    - Fix crash when importing appindicator from Python (LP: #724917).
+
+ -- Артём Попов <[e-mail]>  Mon, 28 Feb 2011 22:33:47 +0600
+
 libappindicator (0.2.96-0ubuntu2) natty; urgency=low
 
   * debian/control, debian/rules:

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-02-28 13:58:38 +0000
+++ debian/patches/series	2011-02-28 17:06:23 +0000
@@ -1,1 +1,2 @@
 disconnect-from-theme.patch
+update-defs.patch

=== added file 'debian/patches/update-defs.patch'
--- debian/patches/update-defs.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/update-defs.patch	2011-02-28 17:06:23 +0000
@@ -0,0 +1,169 @@
+Index: ubuntu/bindings/python/appindicator.defs
+===================================================================
+--- ubuntu.orig/bindings/python/appindicator.defs	2011-02-28 22:32:45.853399929 +0600
++++ ubuntu/bindings/python/appindicator.defs	2011-02-28 22:33:12.205528749 +0600
+@@ -33,7 +33,6 @@
+   )
+ )
+ 
+-
+ ;; From app-indicator.h
+ 
+ (define-function app_indicator_get_type
+@@ -62,57 +61,50 @@
+   )
+ )
+ 
+-(define-method set_label
++(define-method set_attention_icon
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_set_label")
++  (c-name "app_indicator_set_attention_icon_full")
+   (return-type "none")
+   (parameters
+-    '("const-gchar*" "label" (null-ok))
+-    '("const-gchar*" "guide" (null-ok) (default "NULL"))
++    '("const-gchar*" "icon_name")
++    '("const-gchar*" "icon_desc" (null-ok) (default "NULL"))
+   )
+ )
+ 
+-(define-method set_accessible_desc
++(define-method set_menu
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_set_accessible_desc")
++  (c-name "app_indicator_set_menu")
+   (return-type "none")
+   (parameters
+-    '("const-gchar*" "accessible_desc" (null-ok))
+-  )
+-)
+-
+-(define-method set_ordering_index
+-  (of-object "AppIndicator")
+-  (c-name "app_indicator_set_ordering_index")
+-  (parameters
+-    '("guint32" "ordering_index")
++    '("GtkMenu*" "menu")
+   )
+ )
+ 
+-(define-method set_attention_icon
++(define-method set_icon
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_set_attention_icon")
++  (c-name "app_indicator_set_icon_full")
+   (return-type "none")
+   (parameters
+     '("const-gchar*" "icon_name")
++    '("const-gchar*" "icon_desc" (null-ok) (default "NULL"))
+   )
+ )
+ 
+-(define-method set_menu
++(define-method set_label
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_set_menu")
++  (c-name "app_indicator_set_label")
+   (return-type "none")
+   (parameters
+-    '("GtkMenu*" "menu")
++    '("const-gchar*" "label" (null-ok))
++    '("const-gchar*" "guide" (null-ok) (default "NULL"))
+   )
+ )
+ 
+-(define-method set_icon
++(define-method set_ordering_index
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_set_icon")
+-  (return-type "none")
++  (c-name "app_indicator_set_ordering_index")
+   (parameters
+-    '("const-gchar*" "icon_name")
++    '("guint32" "ordering_index")
+   )
+ )
+ 
+@@ -143,46 +135,66 @@
+   (return-type "AppIndicatorStatus")
+ )
+ 
+-(define-method get_label
++(define-method get_icon
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_get_label")
++  (c-name "app_indicator_get_icon")
+   (return-type "const-gchar*")
+ )
+ 
+-(define-method get_label_guide
++(define-method get_icon_desc
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_get_label_guide")
++  (c-name "app_indicator_get_icon_desc")
+   (return-type "const-gchar*")
+ )
+ 
+-(define-method get_accessible_desc
++(define-method get_icon_theme_path
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_get_accessible_desc")
++  (c-name "app_indicator_get_icon_theme_path")
+   (return-type "const-gchar*")
+ )
+ 
+-(define-method get_ordering_index
++(define-method get_attention_icon
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_get_ordering_index")
+-  (return-type "guint32")
++  (c-name "app_indicator_get_attention_icon")
++  (return-type "const-gchar*")
+ )
+ 
+-(define-method get_icon
++(define-method get_attention_icon_desc
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_get_icon")
++  (c-name "app_indicator_get_attention_icon_desc")
+   (return-type "const-gchar*")
+ )
+ 
+-(define-method get_icon_theme_path
++(define-method get_menu
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_get_icon_theme_path")
++  (c-name "app_indicator_get_menu")
++  (return-type "GtkMenu*")
++)
++
++(define-method get_label
++  (of-object "AppIndicator")
++  (c-name "app_indicator_get_label")
+   (return-type "const-gchar*")
+ )
+ 
+-(define-method get_attention_icon
++(define-method get_label_guide
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_get_attention_icon")
++  (c-name "app_indicator_get_label_guide")
+   (return-type "const-gchar*")
+ )
+ 
++(define-method get_ordering_index
++  (of-object "AppIndicator")
++  (c-name "app_indicator_get_ordering_index")
++  (return-type "guint32")
++)
+ 
++(define-method build_menu_from_desktop
++  (of-object "AppIndicator")
++  (c-name "app_indicator_build_menu_from_desktop")
++  (return-type "none")
++  (parameters
++    '("const-gchar*" "desktop_file")
++    '("const-gchar*" "desktop_profile")
++  )
++)