Updating branch refs/heads/master
to 8019cbb996dd8f8f6858c209dafb3bb310c3f227 (commit)
from 842ab66e440d28121d72247ff4534520d144f21a (commit)
commit 8019cbb996dd8f8f6858c209dafb3bb310c3f227
Author: Mike Massonnet <[email protected]>
Date: Sun Oct 21 17:16:54 2012 +0200
Update exo-1 package
packages/exo-1/exo-1-custom.vala | 2 +-
packages/exo-1/exo-1.defines | 2 +-
packages/exo-1/exo-1.excludes | 32 +++++++++++++++++++++++---------
packages/exo-1/exo-1.gi | 34 ++++++++++++++++++++++++++++++++++
vapi/exo-1.vapi | 19 ++++++++++++++++++-
5 files changed, 77 insertions(+), 12 deletions(-)
diff --git a/packages/exo-1/exo-1-custom.vala b/packages/exo-1/exo-1-custom.vala
index 796b758..3d986ad 100644
--- a/packages/exo-1/exo-1-custom.vala
+++ b/packages/exo-1/exo-1-custom.vala
@@ -10,7 +10,7 @@ namespace Exo {
public class MutualBinding {
}
- /* exo-gdk-pixbuf-extensions.h exo-gobject-extensions.h
exo-gtk-extensions.h exo-pango-extensions.h */
+ /* exo-gdk-pixbuf-extensions.h exo-gobject-extensions.h
exo-gtk-extensions.h */
[Compact]
public class Extensions {
public static Gdk.Pixbuf gdk_pixbuf_colorize (Gdk.Pixbuf src,
Gdk.Color color);
diff --git a/packages/exo-1/exo-1.defines b/packages/exo-1/exo-1.defines
index d2d5223..3446cbe 100644
--- a/packages/exo-1/exo-1.defines
+++ b/packages/exo-1/exo-1.defines
@@ -1 +1 @@
--DEXO_INSIDE_EXO_H -DEXO_DISABLE_DEPRECATED
+-DEXO_COMPILATION
diff --git a/packages/exo-1/exo-1.excludes b/packages/exo-1/exo-1.excludes
index 1f6c9c3..55b227a 100644
--- a/packages/exo-1/exo-1.excludes
+++ b/packages/exo-1/exo-1.excludes
@@ -1,9 +1,23 @@
-include/exo-1/exo/exo.h
-include/exo-1/exo/exo-config.h
-include/exo-1/exo/exo-execute.h
-include/exo-1/exo/exo-gdk-pixbuf-extensions.h
-include/exo-1/exo/exo-gobject-extensions.h
-include/exo-1/exo/exo-gtk-extensions.h
-include/exo-1/exo/exo-pango-extensions.h
-include/exo-1/exo/exo-string.h
-include/exo-1/exo/exo-utils.h
+#exo-binding.h
+#exo-cell-renderer-ellipsized-text.h
+#exo-cell-renderer-icon.h
+#exo-config.h
+#exo-enum-types.h
+exo-execute.h
+exo-gdk-pixbuf-extensions.h
+exo-gobject-extensions.h
+exo-gtk-extensions.h
+#exo-icon-bar.h
+#exo-icon-chooser-dialog.h
+#exo-icon-view.h
+#exo-job.h
+#exo-simple-job.h
+exo-string.h
+#exo-toolbars-editor-dialog.h
+#exo-toolbars-editor.h
+#exo-toolbars-model.h
+#exo-toolbars-view.h
+#exo-tree-view.h
+exo-utils.h
+#exo-wrap-table.h
+#exo-xsession-client.h
diff --git a/packages/exo-1/exo-1.gi b/packages/exo-1/exo-1.gi
index 2c4cf9a..0a715be 100644
--- a/packages/exo-1/exo-1.gi
+++ b/packages/exo-1/exo-1.gi
@@ -1,6 +1,14 @@
<?xml version="1.0"?>
<api version="1.0">
<namespace name="Exo">
+ <function name="check_version" symbol="exo_check_version">
+ <return-type type="gchar*"/>
+ <parameters>
+ <parameter name="required_major" type="guint"/>
+ <parameter name="required_minor" type="guint"/>
+ <parameter name="required_micro" type="guint"/>
+ </parameters>
+ </function>
<callback name="ExoBindingTransform">
<return-type type="gboolean"/>
<parameters>
@@ -428,6 +436,20 @@
<parameter name="cell"
type="GtkCellRenderer**"/>
</parameters>
</method>
+ <method name="get_item_column"
symbol="exo_icon_view_get_item_column">
+ <return-type type="gint"/>
+ <parameters>
+ <parameter name="icon_view"
type="ExoIconView*"/>
+ <parameter name="path"
type="GtkTreePath*"/>
+ </parameters>
+ </method>
+ <method name="get_item_row"
symbol="exo_icon_view_get_item_row">
+ <return-type type="gint"/>
+ <parameters>
+ <parameter name="icon_view"
type="ExoIconView*"/>
+ <parameter name="path"
type="GtkTreePath*"/>
+ </parameters>
+ </method>
<method name="get_item_width"
symbol="exo_icon_view_get_item_width">
<return-type type="gint"/>
<parameters>
@@ -598,6 +620,12 @@
<parameter name="data" type="gpointer"/>
</parameters>
</method>
+ <method name="selection_invert"
symbol="exo_icon_view_selection_invert">
+ <return-type type="void"/>
+ <parameters>
+ <parameter name="icon_view"
type="ExoIconView*"/>
+ </parameters>
+ </method>
<method name="set_column_spacing"
symbol="exo_icon_view_set_column_spacing">
<return-type type="void"/>
<parameters>
@@ -1615,6 +1643,12 @@
<return-type type="void"/>
</vfunc>
</object>
+ <constant name="EXO_MAJOR_VERSION" type="int" value="0"/>
+ <constant name="EXO_MICRO_VERSION" type="int" value="0"/>
+ <constant name="EXO_MINOR_VERSION" type="int" value="9"/>
+ <constant name="EXO_PARAM_READABLE" type="int" value="0"/>
+ <constant name="EXO_PARAM_READWRITE" type="int" value="0"/>
+ <constant name="EXO_PARAM_WRITABLE" type="int" value="0"/>
<constant name="EXO_TOOLBARS_ITEM_TYPE" type="char*"
value="application/x-exo-toolbars-item"/>
</namespace>
</api>
diff --git a/vapi/exo-1.vapi b/vapi/exo-1.vapi
index 5ab766d..404d3be 100644
--- a/vapi/exo-1.vapi
+++ b/vapi/exo-1.vapi
@@ -1,4 +1,4 @@
-/* exo-1.vapi generated by vapigen-0.16, do not modify. */
+/* exo-1.vapi generated by vapigen, do not modify. */
namespace Exo {
[CCode (cheader_filename = "exo/exo.h", free_function = "")]
@@ -104,6 +104,8 @@ namespace Exo {
public void get_drag_dest_item (out unowned Gtk.TreePath path,
Exo.IconViewDropPosition pos);
public bool get_enable_search ();
public bool get_item_at_pos (int x, int y, out unowned
Gtk.TreePath path, out unowned Gtk.CellRenderer cell);
+ public int get_item_column (Gtk.TreePath path);
+ public int get_item_row (Gtk.TreePath path);
public int get_item_width ();
public Exo.IconViewLayoutMode get_layout_mode ();
public int get_margin ();
@@ -127,6 +129,7 @@ namespace Exo {
public void select_all ();
public void select_path (Gtk.TreePath path);
public void selected_foreach (Exo.IconViewForeachFunc func,
void* data);
+ public void selection_invert ();
public void set_column_spacing (int column_spacing);
public void set_columns (int columns);
public void set_cursor (Gtk.TreePath path, Gtk.CellRenderer
cell, bool start_editing);
@@ -388,5 +391,19 @@ namespace Exo {
[CCode (cheader_filename = "exo/exo.h", has_target = false)]
public delegate bool SimpleJobFunc (Exo.Job job, GLib.ValueArray
param_values) throws GLib.Error;
[CCode (cheader_filename = "exo/exo.h")]
+ public const int MAJOR_VERSION;
+ [CCode (cheader_filename = "exo/exo.h")]
+ public const int MICRO_VERSION;
+ [CCode (cheader_filename = "exo/exo.h")]
+ public const int MINOR_VERSION;
+ [CCode (cheader_filename = "exo/exo.h")]
+ public const int PARAM_READABLE;
+ [CCode (cheader_filename = "exo/exo.h")]
+ public const int PARAM_READWRITE;
+ [CCode (cheader_filename = "exo/exo.h")]
+ public const int PARAM_WRITABLE;
+ [CCode (cheader_filename = "exo/exo.h")]
public const string TOOLBARS_ITEM_TYPE;
+ [CCode (cheader_filename = "exo/exo.h")]
+ public static unowned string check_version (uint required_major, uint
required_minor, uint required_micro);
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
