Don't use deprecated GtkTooltips API. Add commented out lines in

2007-10-13  Xavier Claessens  <xclaesse@gmail.com>

	* 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.


svn path=/trunk/; revision=371

5 files changed, 12 insertions, 39 deletions

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);
diff --git a/libempathy-gtk/empathy-chat-view.h b/libempathy-gtk/empathy-chat-view.h
index 370c8dd85..0402bd7c0 100644
--- a/libempathy-gtk/empathy-chat-view.h
+++ b/libempathy-gtk/empathy-chat-view.h
@@ -26,7 +26,6 @@
 #define __EMPATHY_CHAT_VIEW_H__
 
 #include <gtk/gtktextview.h>
-#include <gtk/gtktooltips.h>
 
 #include <libempathy/empathy-contact.h>
 #include <libempathy/empathy-message.h>
@@ -90,8 +89,7 @@ void             empathy_chat_view_set_irc_style        (EmpathyChatView *view,
 void             empathy_chat_view_set_margin           (EmpathyChatView *view,
 							 gint             margin);
 GtkWidget *      empathy_chat_view_get_smiley_menu      (GCallback        callback,
-							 gpointer         user_data,
-							 GtkTooltips     *tooltips);
+							 gpointer         user_data);
 void             empathy_chat_view_set_is_group_chat    (EmpathyChatView *view,
 							 gboolean         is_group_chat);
 
diff --git a/libempathy-gtk/empathy-chat-window.c b/libempathy-gtk/empathy-chat-window.c
index 54e896263..a4d29b258 100644
--- a/libempathy-gtk/empathy-chat-window.c
+++ b/libempathy-gtk/empathy-chat-window.c
@@ -74,8 +74,6 @@ struct _EmpathyChatWindowPriv {
 	GtkWidget             *dialog;
 	GtkWidget             *notebook;
 
-	GtkTooltips           *tooltips;
-
 	/* Menu items. */
 	GtkWidget             *menu_conv_clear;
 	GtkWidget             *menu_conv_insert_smiley;
@@ -277,8 +275,6 @@ empathy_chat_window_init (EmpathyChatWindow *window)
 
 	priv = GET_PRIV (window);
 
-	priv->tooltips = g_object_ref_sink (gtk_tooltips_new ());
-
 	glade = empathy_glade_get_file ("empathy-chat.glade",
 				       "chat_window",
 				       NULL,
@@ -345,7 +341,7 @@ empathy_chat_window_init (EmpathyChatWindow *window)
 				  window);
 
 	priv->notebook = gtk_notebook_new ();
- 	gtk_notebook_set_group_id (GTK_NOTEBOOK (priv->notebook), 1); 
+ 	gtk_notebook_set_group (GTK_NOTEBOOK (priv->notebook), "EmpathyChatWindow"); 
 	gtk_box_pack_start (GTK_BOX (chat_vbox), priv->notebook, TRUE, TRUE, 0);
 	gtk_widget_show (priv->notebook);
 
@@ -377,8 +373,7 @@ empathy_chat_window_init (EmpathyChatWindow *window)
 	/* Set up smiley menu */
 	menu = empathy_chat_view_get_smiley_menu (
 		G_CALLBACK (chat_window_insert_smiley_activate_cb),
-		window,
-		priv->tooltips);
+		window);
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (priv->menu_conv_insert_smiley), menu);
 
 	/* Set up signals we can't do with glade since we may need to
@@ -508,7 +503,6 @@ empathy_chat_window_finalize (GObject *object)
 
 	chat_windows = g_list_remove (chat_windows, window);
 	gtk_widget_destroy (priv->dialog);
-	g_object_unref (priv->tooltips);
 
 	g_signal_handlers_disconnect_by_func (priv->chatroom_manager,
 					      chat_window_update_menu,
@@ -1291,10 +1285,7 @@ chat_window_update_tooltip (EmpathyChatWindow *window,
 	}
 
 	widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-tooltip-widget");
-	gtk_tooltips_set_tip (priv->tooltips,
-			      widget,
-			      str,
-			      NULL);
+	gtk_widget_set_tooltip_text (widget, str);
 
 	g_free (str);
 }
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index f68a82826..9dd75c2c7 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -67,7 +67,6 @@ struct _EmpathyChatPriv {
 	EmpathyLogManager     *log_manager;
 	EmpathyTpChat         *tp_chat;
 	EmpathyChatWindow      *window;
-	GtkTooltips           *tooltips;
 	guint                  composing_stop_timeout_id;
 	gboolean               sensitive;
 	gchar                 *id;
@@ -76,7 +75,7 @@ struct _EmpathyChatPriv {
 	GList                 *compositors;
 	guint                  scroll_idle_id;
 	gboolean               first_tp_chat;
-	EmpathyTime            last_log_timestamp;
+	time_t                 last_log_timestamp;
 	/* Used to automatically shrink a window that has temporarily
 	 * grown due to long input. 
 	 */
@@ -237,7 +236,6 @@ empathy_chat_init (EmpathyChat *chat)
 
 	priv->manager = empathy_contact_manager_new ();
 	priv->log_manager = empathy_log_manager_new ();
-	priv->tooltips = g_object_ref_sink (gtk_tooltips_new ());
 	priv->default_window_height = -1;
 	priv->vscroll_visible = FALSE;
 	priv->sensitive = TRUE;
@@ -303,7 +301,6 @@ chat_finalize (GObject *object)
 	g_object_unref (chat->account);
 	g_object_unref (priv->manager);
 	g_object_unref (priv->log_manager);
-	g_object_unref (priv->tooltips);
 
 	if (priv->tp_chat) {
 		g_object_unref (priv->tp_chat);
@@ -402,7 +399,7 @@ chat_message_received_cb (EmpathyTpChat  *tp_chat,
 {
 	EmpathyChatPriv *priv;
 	EmpathyContact  *sender;
-	EmpathyTime      timestamp;
+	time_t           timestamp;
 
 	priv = GET_PRIV (chat);
 
@@ -927,8 +924,7 @@ chat_text_populate_popup_cb (GtkTextView *view,
 
 	smiley_menu = empathy_chat_view_get_smiley_menu (
 		G_CALLBACK (chat_insert_smiley_activate_cb),
-		chat,
-		priv->tooltips);
+		chat);
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), smiley_menu);
 
 	/* Add the spell check menu item. */
diff --git a/libempathy-gtk/empathy-main-window.c b/libempathy-gtk/empathy-main-window.c
index 8883fa306..26e54226f 100644
--- a/libempathy-gtk/empathy-main-window.c
+++ b/libempathy-gtk/empathy-main-window.c
@@ -75,9 +75,6 @@ typedef struct {
 	GtkWidget              *window;
 	GtkWidget              *main_vbox;
 
-	/* Tooltips for all widgets */
-	GtkTooltips            *tooltips;
-
 	/* Menu widgets */
 	GtkWidget              *room;
 	GtkWidget              *room_menu;
@@ -187,7 +184,6 @@ empathy_main_window_show (void)
 	GtkWidget                *show_offline_widget;
 	GtkWidget                *ebox;
 	GtkToolItem              *item;
-	gchar                    *str;
 	gboolean                  show_offline;
 	gboolean                  show_avatars;
 	gboolean                  compact_contact_list;
@@ -240,7 +236,6 @@ empathy_main_window_show (void)
 	main_window_connection_items_setup (window, glade);
 	g_object_unref (glade);
 
-	window->tooltips = g_object_ref_sink (gtk_tooltips_new ());
 	window->mc = empathy_mission_control_new ();
 	dbus_g_proxy_connect_signal (DBUS_G_PROXY (window->mc), "AccountStatusChanged",
 				     G_CALLBACK (main_window_status_changed_cb),
@@ -276,9 +271,7 @@ empathy_main_window_show (void)
 
 	gtk_toolbar_insert (GTK_TOOLBAR (window->presence_toolbar), item, -1);
 
-	str = _("Show and edit accounts");
-	gtk_tooltips_set_tip (GTK_TOOLTIPS (window->tooltips),
-			      ebox, str, str);
+	gtk_widget_set_tooltip_text (ebox, _("Show and edit accounts"));
 
 	g_signal_connect (ebox,
 			  "button-press-event",
@@ -386,7 +379,6 @@ main_window_destroy_cb (GtkWidget         *widget,
 	g_list_free (window->widgets_connected);
 	g_list_free (window->widgets_disconnected);
 
-	g_object_unref (window->tooltips);
 	g_object_unref (window->mc);
 	g_object_unref (window->list_store);