* New upstream release.

  * Set includedir to the location of the headers provided by 
    libappindicator-dev (LP: #721562)
  * Fix crash when importing appindicator from Python (LP: #724917).
  * Fix crash when switching themes by disconnecting a signal from
    the theme on dispose.  LP: #708188

1 files changed, 52 insertions, 40 deletions

diff --git a/bindings/python/appindicator.defs b/bindings/python/appindicator.defs
index cc8ae75..4fcc2d5 100644
--- a/bindings/python/appindicator.defs
+++ b/bindings/python/appindicator.defs
@@ -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")
+  )
+)