aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--embed/mozilla/mozilla-embed.cpp2
-rwxr-xr-xlib/egg/egg-editable-toolbar.c35
3 files changed, 39 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ac99432b..cebf68c68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-11-10 Marco Pesenti Gritti <marco@gnome.org>
+
+ * embed/mozilla/mozilla-embed.cpp:
+
+ Remove a decl I forgot.
+
+ * lib/egg/egg-editable-toolbar.c: (create_item_from_action),
+ (create_item), (drag_data_received_cb), (item_added_cb),
+ (egg_editable_toolbar_construct):
+
+ Copy hack from gtk to make tooltips work.
+
2003-11-10 Christian Persch <chpe@cvs.gnome.org>
* lib/egg/egg-toolbars-model.c: (egg_toolbars_model_load):
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 79c851d62..c41ecbf3a 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -65,8 +65,6 @@ static void
mozilla_embed_js_status_cb (GtkMozEmbed *embed, MozillaEmbed *membed);
static void
mozilla_embed_visibility_cb (GtkMozEmbed *embed, gboolean visibility, MozillaEmbed *membed);
-static void
-mozilla_embed_destroy_brsr_cb (GtkMozEmbed *embed, MozillaEmbed *embed);
static gint
mozilla_embed_dom_mouse_click_cb (GtkMozEmbed *embed, gpointer dom_event, MozillaEmbed *membed);
static gint
diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c
index 46ab956f3..73e1188cc 100755
--- a/lib/egg/egg-editable-toolbar.c
+++ b/lib/egg/egg-editable-toolbar.c
@@ -312,7 +312,8 @@ set_item_drag_source (GtkWidget *item,
static GtkWidget *
create_item_from_action (EggEditableToolbar *t,
const char *action_name,
- gboolean is_separator)
+ gboolean is_separator,
+ GtkAction **ret_action)
{
GtkWidget *item;
GtkAction *action;
@@ -357,6 +358,11 @@ create_item_from_action (EggEditableToolbar *t,
gtk_tool_item_set_use_drag_window (GTK_TOOL_ITEM (item), TRUE);
}
+ if (ret_action)
+ {
+ *ret_action = action;
+ }
+
return item;
}
@@ -364,15 +370,15 @@ static GtkWidget *
create_item (EggEditableToolbar *t,
EggToolbarsModel *model,
int toolbar_position,
- int position)
+ int position,
+ GtkAction **ret_action)
{
const char *action_name;
gboolean is_separator;
action_name = egg_toolbars_model_item_nth
- (model, toolbar_position, position,
- &is_separator);
- return create_item_from_action (t, action_name, is_separator);
+ (model, toolbar_position, position, &is_separator);
+ return create_item_from_action (t, action_name, is_separator, ret_action);
}
static gboolean
@@ -416,7 +422,7 @@ drag_data_received_cb (GtkWidget *widget,
{
etoolbar->priv->pending = FALSE;
etoolbar->priv->dragged_item =
- create_item_from_action (etoolbar, id, data_is_separator (id));
+ create_item_from_action (etoolbar, id, data_is_separator (id), NULL);
}
else
{
@@ -755,12 +761,19 @@ item_added_cb (EggToolbarsModel *model,
{
GtkWidget *toolbar;
GtkWidget *item;
+ GtkAction *action;
toolbar = get_toolbar_nth (t, toolbar_position);
gtk_widget_set_size_request (toolbar, -1, -1);
- item = create_item (t, model, toolbar_position, position);
+ item = create_item (t, model, toolbar_position, position, &action);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
GTK_TOOL_ITEM (item), position);
+
+ /* FIXME Hack to make tooltip work from gtk */
+ if (action)
+ {
+ g_object_notify (G_OBJECT (action), "tooltip");
+ }
}
static void
@@ -836,12 +849,18 @@ egg_editable_toolbar_construct (EggEditableToolbar *t)
for (l = 0; l < n_items; l++)
{
GtkWidget *item;
+ GtkAction *action;
- item = create_item (t, model, i, l);
+ item = create_item (t, model, i, l, &action);
if (item)
{
gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
GTK_TOOL_ITEM (item), l);
+ /* FIXME Hack to make tooltip work from gtk */
+ if (action)
+ {
+ g_object_notify (G_OBJECT (action), "tooltip");
+ }
}
else
{