Merge lp:~artfwo/libappindicator/fix-for-bug-724917 into lp:libappindicator

[Artem Popov]

Synced bindings/python/appindicator.defs with the latest appindicator.h

Fixes bug 724917

[Ted Gould (ted)]

  review approve
  merge approve

review: Approve

=== modified file 'bindings/python/appindicator.defs'
--- bindings/python/appindicator.defs	2011-02-08 06:55:35 +0000
+++ bindings/python/appindicator.defs	2011-02-26 13:10:44 +0000
@@ -33,7 +33,6 @@
   )
 )
 
-
 ;; From app-indicator.h
 
 (define-function app_indicator_get_type
@@ -62,6 +61,35 @@
   )
 )
 
+(define-method set_attention_icon
+  (of-object "AppIndicator")
+  (c-name "app_indicator_set_attention_icon_full")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "icon_name")
+    '("const-gchar*" "icon_desc" (null-ok) (default "NULL"))
+  )
+)
+
+(define-method set_menu
+  (of-object "AppIndicator")
+  (c-name "app_indicator_set_menu")
+  (return-type "none")
+  (parameters
+    '("GtkMenu*" "menu")
+  )
+)
+
+(define-method set_icon
+  (of-object "AppIndicator")
+  (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_label
   (of-object "AppIndicator")
   (c-name "app_indicator_set_label")
@@ -72,15 +100,6 @@
   )
 )
 
-(define-method set_accessible_desc
-  (of-object "AppIndicator")
-  (c-name "app_indicator_set_accessible_desc")
-  (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")
@@ -89,33 +108,6 @@
   )
 )
 
-(define-method set_attention_icon
-  (of-object "AppIndicator")
-  (c-name "app_indicator_set_attention_icon")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "icon_name")
-  )
-)
-
-(define-method set_menu
-  (of-object "AppIndicator")
-  (c-name "app_indicator_set_menu")
-  (return-type "none")
-  (parameters
-    '("GtkMenu*" "menu")
-  )
-)
-
-(define-method set_icon
-  (of-object "AppIndicator")
-  (c-name "app_indicator_set_icon")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "icon_name")
-  )
-)
-
 (define-method set_icon_theme_path
   (of-object "AppIndicator")
   (c-name "app_indicator_set_icon_theme_path")
@@ -143,6 +135,42 @@
   (return-type "AppIndicatorStatus")
 )
 
+(define-method get_icon
+  (of-object "AppIndicator")
+  (c-name "app_indicator_get_icon")
+  (return-type "const-gchar*")
+)
+
+(define-method get_icon_desc
+  (of-object "AppIndicator")
+  (c-name "app_indicator_get_icon_desc")
+  (return-type "const-gchar*")
+)
+
+(define-method get_icon_theme_path
+  (of-object "AppIndicator")
+  (c-name "app_indicator_get_icon_theme_path")
+  (return-type "const-gchar*")
+)
+
+(define-method get_attention_icon
+  (of-object "AppIndicator")
+  (c-name "app_indicator_get_attention_icon")
+  (return-type "const-gchar*")
+)
+
+(define-method get_attention_icon_desc
+  (of-object "AppIndicator")
+  (c-name "app_indicator_get_attention_icon_desc")
+  (return-type "const-gchar*")
+)
+
+(define-method get_menu
+  (of-object "AppIndicator")
+  (c-name "app_indicator_get_menu")
+  (return-type "GtkMenu*")
+)
+
 (define-method get_label
   (of-object "AppIndicator")
   (c-name "app_indicator_get_label")
@@ -155,34 +183,18 @@
   (return-type "const-gchar*")
 )
 
-(define-method get_accessible_desc
-  (of-object "AppIndicator")
-  (c-name "app_indicator_get_accessible_desc")
-  (return-type "const-gchar*")
-)
-
 (define-method get_ordering_index
   (of-object "AppIndicator")
   (c-name "app_indicator_get_ordering_index")
   (return-type "guint32")
 )
 
-(define-method get_icon
-  (of-object "AppIndicator")
-  (c-name "app_indicator_get_icon")
-  (return-type "const-gchar*")
-)
-
-(define-method get_icon_theme_path
-  (of-object "AppIndicator")
-  (c-name "app_indicator_get_icon_theme_path")
-  (return-type "const-gchar*")
-)
-
-(define-method get_attention_icon
-  (of-object "AppIndicator")
-  (c-name "app_indicator_get_attention_icon")
-  (return-type "const-gchar*")
-)
-
-
+(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")
+  )
+)