From 46b36ddc5af420c903db28e8e1aa7c5c7b07f4b9 Mon Sep 17 00:00:00 2001 From: xclaesse Date: Sat, 13 Oct 2007 13:00:29 +0000 Subject: 2007-10-13 Xavier Claessens * libempathy-gtk/empathy-chat-view.h: * libempathy-gtk/empathy-main-window.c: * libempathy-gtk/empathy-chat.c: * libempathy-gtk/empathy-chat-window.c: * libempathy-gtk/empathy-chat-view.c: * libempathy/empathy-log-manager.c: * libempathy/empathy-time.c: * libempathy/empathy-tp-chat.c: * libempathy/empathy-time.h: * libempathy/empathy-message.c: * libempathy/empathy-message.h: * libempathy/empathy-presence.c: * configure.ac: Don't use deprecated GtkTooltips API. Add commented out lines in configure.ac to disable GLib and GTK deprecated symbols. Replace EmpathyTime by time_t which is more appropriate for timestamps. * doc/*: Updated. git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@371 4ee84921-47dd-4033-b63a-18d7a039a3e4 --- libempathy-gtk/empathy-chat-view.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'libempathy-gtk/empathy-chat-view.c') diff --git a/libempathy-gtk/empathy-chat-view.c b/libempathy-gtk/empathy-chat-view.c index 116892b60..e0c75b191 100644 --- a/libempathy-gtk/empathy-chat-view.c +++ b/libempathy-gtk/empathy-chat-view.c @@ -725,10 +725,10 @@ chat_view_maybe_append_date_and_time (EmpathyChatView *view, } date = g_date_new (); - g_date_set_time (date, timestamp); + g_date_set_time_t (date, timestamp); last_date = g_date_new (); - g_date_set_time (last_date, priv->last_timestamp); + g_date_set_time_t (last_date, priv->last_timestamp); append_date = FALSE; append_time = FALSE; @@ -1958,8 +1958,7 @@ empathy_chat_view_set_margin (EmpathyChatView *view, GtkWidget * empathy_chat_view_get_smiley_menu (GCallback callback, - gpointer user_data, - GtkTooltips *tooltips) + gpointer user_data) { EmpathySmileyManager *smiley_manager; GSList *smileys, *l; @@ -1987,10 +1986,7 @@ empathy_chat_view_get_smiley_menu (GCallback callback, gtk_menu_attach (GTK_MENU (menu), item, x, x + 1, y, y + 1); - gtk_tooltips_set_tip (tooltips, - item, - smiley->str, - NULL); + gtk_widget_set_tooltip_text (item, smiley->str); g_object_set_data (G_OBJECT (item), "smiley_text", smiley->str); g_signal_connect (item, "activate", callback, user_data); -- cgit v1.2.3