aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Escalante Urrelo <descalante@igalia.com>2010-12-15 03:53:56 +0800
committerDiego Escalante Urrelo <descalante@igalia.com>2010-12-15 07:34:05 +0800
commitf6ffd608f887ede6e39d03aff38c6d43682fd231 (patch)
treec6605bcd1ab33f198f43ae6e3aa85f3487bc6ec4
parent534eae1b801c93950e2b664ffe772375d0fe2340 (diff)
downloadgsoc2013-epiphany-f6ffd608f887ede6e39d03aff38c6d43682fd231.tar
gsoc2013-epiphany-f6ffd608f887ede6e39d03aff38c6d43682fd231.tar.gz
gsoc2013-epiphany-f6ffd608f887ede6e39d03aff38c6d43682fd231.tar.bz2
gsoc2013-epiphany-f6ffd608f887ede6e39d03aff38c6d43682fd231.tar.lz
gsoc2013-epiphany-f6ffd608f887ede6e39d03aff38c6d43682fd231.tar.xz
gsoc2013-epiphany-f6ffd608f887ede6e39d03aff38c6d43682fd231.tar.zst
gsoc2013-epiphany-f6ffd608f887ede6e39d03aff38c6d43682fd231.zip
egg: update from master
Bug #636501
-rw-r--r--lib/egg/egg-editable-toolbar.c27
-rw-r--r--lib/egg/egg-toolbar-editor.c4
-rw-r--r--lib/egg/egg-toolbars-model.c18
-rwxr-xr-xlib/egg/update-from-egg.sh2
4 files changed, 46 insertions, 5 deletions
diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c
index 0320c250d..44f393dc4 100644
--- a/lib/egg/egg-editable-toolbar.c
+++ b/lib/egg/egg-editable-toolbar.c
@@ -487,8 +487,8 @@ configure_item_cursor (GtkToolItem *item,
}
else if (stock_id)
{
- pixbuf = gtk_widget_render_icon (widget, stock_id,
- GTK_ICON_SIZE_LARGE_TOOLBAR, NULL);
+ pixbuf = gtk_widget_render_icon_pixbuf (widget, stock_id,
+ GTK_ICON_SIZE_LARGE_TOOLBAR);
}
g_free (icon_name);
g_free (stock_id);
@@ -1428,6 +1428,12 @@ egg_editable_toolbar_set_ui_manager (EggEditableToolbar *etoolbar,
toolbar_visibility_refresh (etoolbar);
}
+/**
+ * egg_editable_toolbar_get_selected:
+ * @etoolbar:
+ *
+ * Returns: (transfer none):
+ **/
GtkWidget * egg_editable_toolbar_get_selected (EggEditableToolbar *etoolbar)
{
return etoolbar->priv->selected;
@@ -1818,8 +1824,25 @@ _egg_editable_toolbar_new_separator_image (void)
return image;
}
+/**
+ * egg_editable_toolbar_get_model:
+ * @etoolbar:
+ *
+ * Returns: (transfer none):
+ **/
EggToolbarsModel *
egg_editable_toolbar_get_model (EggEditableToolbar *etoolbar)
{
return etoolbar->priv->model;
}
+
+/**
+ * egg_editable_toolbar_get_manager:
+ *
+ * Return value: (transfer none):
+ */
+GtkUIManager *
+egg_editable_toolbar_get_manager (EggEditableToolbar *etoolbar)
+{
+ return etoolbar->priv->manager;
+}
diff --git a/lib/egg/egg-toolbar-editor.c b/lib/egg/egg-toolbar-editor.c
index 9763342c4..fc97cbbca 100644
--- a/lib/egg/egg-toolbar-editor.c
+++ b/lib/egg/egg-toolbar-editor.c
@@ -380,8 +380,8 @@ event_box_realize_cb (GtkWidget *widget, GtkImage *icon)
GdkPixbuf *pixbuf;
gtk_image_get_stock (icon, &stock_id, NULL);
- pixbuf = gtk_widget_render_icon (widget, stock_id,
- GTK_ICON_SIZE_LARGE_TOOLBAR, NULL);
+ pixbuf = gtk_widget_render_icon_pixbuf (widget, stock_id,
+ GTK_ICON_SIZE_LARGE_TOOLBAR);
gtk_drag_source_set_icon_pixbuf (widget, pixbuf);
g_object_unref (pixbuf);
}
diff --git a/lib/egg/egg-toolbars-model.c b/lib/egg/egg-toolbars-model.c
index b9a5f4439..31a6d5eeb 100644
--- a/lib/egg/egg-toolbars-model.c
+++ b/lib/egg/egg-toolbars-model.c
@@ -946,12 +946,24 @@ egg_toolbars_model_toolbar_nth (EggToolbarsModel *model,
return tdata->name;
}
+/**
+ * egg_toolbars_model_get_types:
+ * @model:
+ *
+ * Returns: (transfer none) (element-type EggToolbarsItemType):
+ */
GList *
egg_toolbars_model_get_types (EggToolbarsModel *model)
{
return model->priv->types;
}
+/**
+ * egg_toolbars_model_set_types:
+ * @model:
+ * @types: (element-type EggToolbarsItemType):
+ *
+ */
void
egg_toolbars_model_set_types (EggToolbarsModel *model, GList *types)
{
@@ -966,6 +978,12 @@ fill_avail_array (gpointer key, gpointer value, GPtrArray *array)
g_ptr_array_add (array, key);
}
+/**
+ * egg_toolbars_model_get_name_avail:
+ * @model:
+ *
+ * Returns: (element-type utf8) (transfer container):
+ */
GPtrArray *
egg_toolbars_model_get_name_avail (EggToolbarsModel *model)
{
diff --git a/lib/egg/update-from-egg.sh b/lib/egg/update-from-egg.sh
index c7b8320e0..b3a78fd8b 100755
--- a/lib/egg/update-from-egg.sh
+++ b/lib/egg/update-from-egg.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
EGGFILES="egg-editable-toolbar.c \
egg-toolbars-model.c \