Updating branch refs/heads/master to c090ae95fcf375a6c176a992c5d461d27c81bbf0 (commit) from e41f8efd7133baa1ee85dbe3874c5e381d8d177b (commit)
commit c090ae95fcf375a6c176a992c5d461d27c81bbf0 Author: Danny Milosavljevic <dan...@xfce.org> Date: Wed Dec 22 07:55:08 2010 +0100 changed to use only 'libxfce4panel-enum-types.h'. panel/arrow_button.defs | 2 +- panel/enums.defs | 2 +- panel/enums.override | 1 - panel/external_plugin.defs | 6 ++-- panel/gen | 2 +- panel/itembar.defs | 40 ++++++++++++++++++++++++--------- panel/plugin_iface.defs | 53 ++++++++++++++++++++++++++++++++++++++----- panel/window.defs | 2 +- 8 files changed, 82 insertions(+), 26 deletions(-) diff --git a/panel/arrow_button.defs b/panel/arrow_button.defs index d627a78..a0782de 100644 --- a/panel/arrow_button.defs +++ b/panel/arrow_button.defs @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4panel/xfce-arrow-button.h +;; From xfce-arrow-button.h (define-function xfce_arrow_button_get_type (c-name "xfce_arrow_button_get_type") diff --git a/panel/enums.defs b/panel/enums.defs index 38aa51a..7e6834a 100644 --- a/panel/enums.defs +++ b/panel/enums.defs @@ -26,6 +26,6 @@ ) -;; From /usr/local/include/xfce4/libxfce4panel/xfce-panel-enums.h +;; From xfce-panel-enums.h diff --git a/panel/enums.override b/panel/enums.override index b16e01c..162b70a 100644 --- a/panel/enums.override +++ b/panel/enums.override @@ -5,7 +5,6 @@ headers #include "pygobject.h" #include <gtk/gtk.h> -#include <libxfce4panel/xfce-panel-enums.h> #include <libxfce4panel/libxfce4panel-enum-types.h> extern PyTypeObject PyGtkWidget_Type; diff --git a/panel/external_plugin.defs b/panel/external_plugin.defs index d0a1190..16a75f9 100644 --- a/panel/external_plugin.defs +++ b/panel/external_plugin.defs @@ -12,7 +12,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4panel/xfce-panel-external-plugin.h +;; From xfce-panel-external-plugin.h (define-function xfce_external_panel_plugin_get_type (c-name "xfce_external_panel_plugin_get_type") @@ -24,8 +24,8 @@ (is-constructor-of "XfceExternalPanelPlugin") (return-type "GtkWidget*") (parameters - '("int" "argc") - '("char**" "argv") + '("gint" "argc") + '("gchar**" "argv") '("XfcePanelPluginFunc" "construct") ) ) diff --git a/panel/gen b/panel/gen index 9f8bb66..fffe123 100755 --- a/panel/gen +++ b/panel/gen @@ -19,7 +19,7 @@ do [ "${defs}" = "internal_plugin.defs" ] && continue [ "${defs}" = "plugin.defs" ] && continue - python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}" + python2 /usr/lib/python2.6/site-packages/gtk-2.0/codegen/h2def.py "$s" >"${defs}" fi done diff --git a/panel/itembar.defs b/panel/itembar.defs index b29336b..9376478 100644 --- a/panel/itembar.defs +++ b/panel/itembar.defs @@ -10,7 +10,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4panel/xfce-itembar.h +;; From xfce-itembar.h (define-function xfce_itembar_get_type (c-name "xfce_itembar_get_type") @@ -26,6 +26,24 @@ ) ) +(define-method set_maximum_size + (of-object "XfceItembar") + (c-name "xfce_itembar_set_maximum_size") + (return-type "none") + (parameters + '("gint" "size") + ) +) + +(define-method set_allow_expand + (of-object "XfceItembar") + (c-name "xfce_itembar_set_allow_expand") + (return-type "none") + (parameters + '("gboolean" "allow") + ) +) + (define-method set_orientation (of-object "XfceItembar") (c-name "xfce_itembar_set_orientation") @@ -47,7 +65,7 @@ (return-type "none") (parameters '("GtkWidget*" "item") - '("int" "position") + '("gint" "position") ) ) @@ -75,7 +93,7 @@ (return-type "none") (parameters '("GtkWidget*" "item") - '("int" "position") + '("gint" "position") ) ) @@ -101,13 +119,13 @@ (define-method get_n_items (of-object "XfceItembar") (c-name "xfce_itembar_get_n_items") - (return-type "int") + (return-type "gint") ) (define-method get_item_index (of-object "XfceItembar") (c-name "xfce_itembar_get_item_index") - (return-type "int") + (return-type "gint") (parameters '("GtkWidget*" "item") ) @@ -118,7 +136,7 @@ (c-name "xfce_itembar_get_nth_item") (return-type "GtkWidget*") (parameters - '("int" "n") + '("gint" "n") ) ) @@ -145,18 +163,18 @@ (c-name "xfce_itembar_get_item_at_point") (return-type "GtkWidget*") (parameters - '("int" "x") - '("int" "y") + '("gint" "x") + '("gint" "y") ) ) (define-method get_drop_index (of-object "XfceItembar") (c-name "xfce_itembar_get_drop_index") - (return-type "int") + (return-type "gint") (parameters - '("int" "x") - '("int" "y") + '("gint" "x") + '("gint" "y") ) ) diff --git a/panel/plugin_iface.defs b/panel/plugin_iface.defs index 34f5485..f812f97 100644 --- a/panel/plugin_iface.defs +++ b/panel/plugin_iface.defs @@ -9,7 +9,7 @@ ;; Enumerations and flags ... -;; From /usr/local/include/xfce4/libxfce4panel/xfce-panel-plugin-iface.h +;; From xfce-panel-plugin-iface.h (define-function xfce_panel_plugin_get_type (c-name "xfce_panel_plugin_get_type") @@ -19,25 +19,25 @@ (define-method get_name (of-object "XfcePanelPlugin") (c-name "xfce_panel_plugin_get_name") - (return-type "const-char*") + (return-type "gchar*") ) (define-method get_id (of-object "XfcePanelPlugin") (c-name "xfce_panel_plugin_get_id") - (return-type "const-char*") + (return-type "gchar*") ) (define-method get_display_name (of-object "XfcePanelPlugin") (c-name "xfce_panel_plugin_get_display_name") - (return-type "const-char*") + (return-type "gchar*") ) (define-method get_size (of-object "XfcePanelPlugin") (c-name "xfce_panel_plugin_get_size") - (return-type "int") + (return-type "gint") ) (define-method get_screen_position @@ -118,16 +118,46 @@ ) ) +(define-method arrow_type + (of-object "XfcePanelPlugin") + (c-name "xfce_panel_plugin_arrow_type") + (return-type "GtkArrowType") +) + +(define-method position_widget + (of-object "XfcePanelPlugin") + (c-name "xfce_panel_plugin_position_widget") + (return-type "none") + (parameters + '("GtkWidget*" "menu_widget") + '("GtkWidget*" "attach_widget") + '("gint*" "x") + '("gint*" "y") + ) +) + +(define-function xfce_panel_plugin_position_menu + (c-name "xfce_panel_plugin_position_menu") + (return-type "none") + (parameters + '("GtkMenu*" "menu") + '("gint*" "x") + '("gint*" "y") + '("gboolean*" "push_in") + '("gpointer" "panel_plugin") + ) +) + (define-method lookup_rc_file (of-object "XfcePanelPlugin") (c-name "xfce_panel_plugin_lookup_rc_file") - (return-type "char*") + (return-type "gchar*") ) (define-method save_location (of-object "XfcePanelPlugin") (c-name "xfce_panel_plugin_save_location") - (return-type "char*") + (return-type "gchar*") (parameters '("gboolean" "create") ) @@ -142,4 +172,13 @@ ) ) +(define-method set_panel_hidden + (of-object "XfcePanelPlugin") + (c-name "xfce_panel_plugin_set_panel_hidden") + (return-type "none") + (parameters + '("gboolean" "hidden") + ) +) + diff --git a/panel/window.defs b/panel/window.defs index 364b4ee..5ebdf1c 100644 --- a/panel/window.defs +++ b/panel/window.defs @@ -22,7 +22,7 @@ ) -;; From /usr/local/include/xfce4/libxfce4panel/xfce-panel-window.h +;; From xfce-panel-window.h (define-function xfce_panel_window_get_type (c-name "xfce_panel_window_get_type") _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits