aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--src/ephy-fullscreen-popup.c11
2 files changed, 11 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 11e8a5e4d..5f2afaf2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-10 Christian Persch <chpe@gnome.org>
+
+ * src/ephy-fullscreen-popup.c:
+ (ephy_fullscreen_popup_set_security_state),
+ (ephy_fullscreen_popup_constructor),
+ (ephy_fullscreen_popup_finalize):
+
+ Port to new tooltips API.
+
2007-07-10 Luca Ferretti <elle.uca@libero.it>
* data/epiphany.desktop.in.in:
diff --git a/src/ephy-fullscreen-popup.c b/src/ephy-fullscreen-popup.c
index b04d12122..800691a02 100644
--- a/src/ephy-fullscreen-popup.c
+++ b/src/ephy-fullscreen-popup.c
@@ -29,7 +29,6 @@
#include <gtk/gtkstock.h>
#include <gtk/gtkimage.h>
#include <gtk/gtkeventbox.h>
-#include <gtk/gtktooltips.h>
#include <gtk/gtkenums.h>
#include <gtk/gtkbox.h>
#include <gtk/gtkhbox.h>
@@ -43,7 +42,6 @@
struct _EphyFullscreenPopupPrivate
{
EphyWindow *window;
- GtkTooltips *tooltips;
GtkWidget *frame;
EphySpinner *spinner;
GtkWidget *lock;
@@ -198,9 +196,9 @@ ephy_fullscreen_popup_set_security_state (EphyFullscreenPopup *popup,
{
EphyFullscreenPopupPrivate *priv = popup->priv;
- priv->show_lock = show_lock;
+ priv->show_lock = show_lock != FALSE;
gtk_image_set_from_stock (GTK_IMAGE (priv->lock), stock, GTK_ICON_SIZE_BUTTON);
- gtk_tooltips_set_tip (priv->tooltips, priv->lock_ebox, tooltip, NULL);
+ gtk_widget_set_tooltip_text (priv->lock, tooltip);
ephy_fullscreen_popup_update_visibility (popup);
}
@@ -238,9 +236,6 @@ ephy_fullscreen_popup_constructor (GType type,
gtk_window_set_resizable (window, FALSE);
- priv->tooltips = gtk_tooltips_new ();
- g_object_ref_sink (priv->tooltips);
-
hbox = gtk_hbox_new (FALSE, 2);
gtk_container_add (GTK_CONTAINER (window), hbox);
gtk_widget_show (hbox);
@@ -301,8 +296,6 @@ ephy_fullscreen_popup_finalize (GObject *object)
g_signal_handlers_disconnect_matched (priv->window, G_SIGNAL_MATCH_DATA,
0, 0, NULL, NULL, popup);
- g_object_unref (priv->tooltips);
-
parent_class->finalize (object);
}