diff options
-rw-r--r-- | ChangeLog | 20 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | doc/libempathy-gtk/tmpl/empathy-chat-view.sgml | 1 | ||||
-rw-r--r-- | doc/libempathy-gtk/tmpl/empathy-contact-dialogs.sgml | 1 | ||||
-rw-r--r-- | doc/libempathy-gtk/tmpl/empathy-contact-widget.sgml | 13 | ||||
-rw-r--r-- | doc/libempathy-gtk/tmpl/empathy-ui-utils.sgml | 40 | ||||
-rw-r--r-- | doc/libempathy/tmpl/empathy-time.sgml | 6 | ||||
-rw-r--r-- | libempathy-gtk/empathy-chat-view.c | 12 | ||||
-rw-r--r-- | libempathy-gtk/empathy-chat-view.h | 4 | ||||
-rw-r--r-- | libempathy-gtk/empathy-chat-window.c | 15 | ||||
-rw-r--r-- | libempathy-gtk/empathy-chat.c | 10 | ||||
-rw-r--r-- | libempathy-gtk/empathy-main-window.c | 10 | ||||
-rw-r--r-- | libempathy/empathy-log-manager.c | 8 | ||||
-rw-r--r-- | libempathy/empathy-message.c | 6 | ||||
-rw-r--r-- | libempathy/empathy-message.h | 4 | ||||
-rw-r--r-- | libempathy/empathy-presence.c | 2 | ||||
-rw-r--r-- | libempathy/empathy-time.c | 12 | ||||
-rw-r--r-- | libempathy/empathy-time.h | 21 | ||||
-rw-r--r-- | libempathy/empathy-tp-chat.c | 2 |
19 files changed, 100 insertions, 91 deletions
@@ -1,5 +1,25 @@ 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. + +2007-10-13 Xavier Claessens <xclaesse@gmail.com> + * libempathy-gtk/empathy-main-window.c: * libempathy-gtk/empathy-presence-chooser.c: * libempathy-gtk/empathy-contact-list-view.c: diff --git a/configure.ac b/configure.ac index 958ca4cea..3dbb6b3e3 100644 --- a/configure.ac +++ b/configure.ac @@ -55,6 +55,10 @@ MISSION_CONTROL_REQUIRED=4.37 IDT_COMPILE_WARNINGS +dnl Uncomment that to build without deprecated GTK and GLib symbols +dnl AC_DEFINE(GTK_DISABLE_DEPRECATED, 1, [Disable deprecated GTK symbols]) +dnl AC_DEFINE(G_DISABLE_DEPRECATED, 1, [Disable deprecated GLib symbols]) + GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal` AC_SUBST(GLIB_GENMARSHAL) diff --git a/doc/libempathy-gtk/tmpl/empathy-chat-view.sgml b/doc/libempathy-gtk/tmpl/empathy-chat-view.sgml index 285cbc73c..bbf0cd194 100644 --- a/doc/libempathy-gtk/tmpl/empathy-chat-view.sgml +++ b/doc/libempathy-gtk/tmpl/empathy-chat-view.sgml @@ -186,7 +186,6 @@ EmpathyChatView @callback: @user_data: -@tooltips: @Returns: diff --git a/doc/libempathy-gtk/tmpl/empathy-contact-dialogs.sgml b/doc/libempathy-gtk/tmpl/empathy-contact-dialogs.sgml index 1a02958b7..a481e45d3 100644 --- a/doc/libempathy-gtk/tmpl/empathy-contact-dialogs.sgml +++ b/doc/libempathy-gtk/tmpl/empathy-contact-dialogs.sgml @@ -34,6 +34,7 @@ empathy-contact-dialogs @contact: @parent: @edit: +@edit_groups: <!-- ##### FUNCTION empathy_new_contact_dialog_show ##### --> diff --git a/doc/libempathy-gtk/tmpl/empathy-contact-widget.sgml b/doc/libempathy-gtk/tmpl/empathy-contact-widget.sgml index 76961c750..e9dee82ae 100644 --- a/doc/libempathy-gtk/tmpl/empathy-contact-widget.sgml +++ b/doc/libempathy-gtk/tmpl/empathy-contact-widget.sgml @@ -17,15 +17,16 @@ empathy-contact-widget <!-- ##### SECTION Stability_Level ##### --> -<!-- ##### ENUM EmpathyContactWidgetType ##### --> +<!-- ##### ENUM EmpathyContactWidgetFlags ##### --> <para> </para> -@CONTACT_WIDGET_TYPE_SHOW: -@CONTACT_WIDGET_TYPE_EDIT: -@CONTACT_WIDGET_TYPE_ADD: -@CONTACT_WIDGET_TYPE_SUBSCRIPTION: +@EMPATHY_CONTACT_WIDGET_EDIT_ALIAS: +@EMPATHY_CONTACT_WIDGET_EDIT_AVATAR: +@EMPATHY_CONTACT_WIDGET_EDIT_ACCOUNT: +@EMPATHY_CONTACT_WIDGET_EDIT_ID: +@EMPATHY_CONTACT_WIDGET_EDIT_GROUPS: <!-- ##### FUNCTION empathy_contact_widget_new ##### --> <para> @@ -33,7 +34,7 @@ empathy-contact-widget </para> @contact: -@type: +@flags: @Returns: diff --git a/doc/libempathy-gtk/tmpl/empathy-ui-utils.sgml b/doc/libempathy-gtk/tmpl/empathy-ui-utils.sgml index b7dbd5420..34d3056c3 100644 --- a/doc/libempathy-gtk/tmpl/empathy-ui-utils.sgml +++ b/doc/libempathy-gtk/tmpl/empathy-ui-utils.sgml @@ -72,16 +72,6 @@ empathy-ui-utils @Varargs: -<!-- ##### FUNCTION empathy_pixbuf_from_icon_name ##### --> -<para> - -</para> - -@icon_name: -@icon_size: -@Returns: - - <!-- ##### FUNCTION empathy_icon_name_from_account ##### --> <para> @@ -118,6 +108,16 @@ empathy-ui-utils @Returns: +<!-- ##### FUNCTION empathy_pixbuf_from_data ##### --> +<para> + +</para> + +@data: +@data_size: +@Returns: + + <!-- ##### FUNCTION empathy_pixbuf_from_avatar_scaled ##### --> <para> @@ -140,6 +140,26 @@ empathy-ui-utils @Returns: +<!-- ##### FUNCTION empathy_pixbuf_scale_down_if_necessary ##### --> +<para> + +</para> + +@pixbuf: +@max_size: +@Returns: + + +<!-- ##### FUNCTION empathy_pixbuf_from_icon_name ##### --> +<para> + +</para> + +@icon_name: +@icon_size: +@Returns: + + <!-- ##### FUNCTION empathy_text_iter_forward_search ##### --> <para> diff --git a/doc/libempathy/tmpl/empathy-time.sgml b/doc/libempathy/tmpl/empathy-time.sgml index 512e7751d..290f8fa6e 100644 --- a/doc/libempathy/tmpl/empathy-time.sgml +++ b/doc/libempathy/tmpl/empathy-time.sgml @@ -31,12 +31,6 @@ empathy-time -<!-- ##### TYPEDEF EmpathyTime ##### --> -<para> - -</para> - - <!-- ##### FUNCTION empathy_time_get_current ##### --> <para> 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); diff --git a/libempathy/empathy-log-manager.c b/libempathy/empathy-log-manager.c index efdbae86b..e5ff2b777 100644 --- a/libempathy/empathy-log-manager.c +++ b/libempathy/empathy-log-manager.c @@ -329,7 +329,7 @@ empathy_log_manager_get_messages_for_file (EmpathyLogManager *manager, EmpathyMessage *message; EmpathyContact *sender; gchar *time; - EmpathyTime t; + time_t t; gchar *sender_id; gchar *sender_name; gchar *body; @@ -527,7 +527,7 @@ empathy_log_manager_search_free (GList *hits) gchar * empathy_log_manager_get_date_readable (const gchar *date) { - EmpathyTime t; + time_t t; t = empathy_time_parse (date); @@ -703,7 +703,7 @@ log_manager_get_filename_for_date (EmpathyLogManager *manager, static gchar * log_manager_get_timestamp_filename (void) { - EmpathyTime t; + time_t t; gchar *time_str; gchar *filename; @@ -719,7 +719,7 @@ log_manager_get_timestamp_filename (void) static gchar * log_manager_get_timestamp_from_message (EmpathyMessage *message) { - EmpathyTime t; + time_t t; t = empathy_message_get_timestamp (message); diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c index ceecd5d55..5c2028bd0 100644 --- a/libempathy/empathy-message.c +++ b/libempathy/empathy-message.c @@ -38,7 +38,7 @@ struct _EmpathyMessagePriv { EmpathyContact *sender; EmpathyContact *receiver; gchar *body; - EmpathyTime timestamp; + time_t timestamp; }; static void empathy_message_class_init (EmpathyMessageClass *class); @@ -385,7 +385,7 @@ empathy_message_set_body (EmpathyMessage *message, g_object_notify (G_OBJECT (message), "body"); } -EmpathyTime +time_t empathy_message_get_timestamp (EmpathyMessage *message) { EmpathyMessagePriv *priv; @@ -399,7 +399,7 @@ empathy_message_get_timestamp (EmpathyMessage *message) void empathy_message_set_timestamp (EmpathyMessage *message, - EmpathyTime timestamp) + time_t timestamp) { EmpathyMessagePriv *priv; diff --git a/libempathy/empathy-message.h b/libempathy/empathy-message.h index 5baddd6bb..af19d364c 100644 --- a/libempathy/empathy-message.h +++ b/libempathy/empathy-message.h @@ -72,9 +72,9 @@ void empathy_message_set_receiver (EmpathyMessage *message, const gchar * empathy_message_get_body (EmpathyMessage *message); void empathy_message_set_body (EmpathyMessage *message, const gchar *body); -EmpathyTime empathy_message_get_timestamp (EmpathyMessage *message); +time_t empathy_message_get_timestamp (EmpathyMessage *message); void empathy_message_set_timestamp (EmpathyMessage *message, - EmpathyTime timestamp); + time_t timestamp); EmpathyMessageType empathy_message_type_from_str (const gchar *type_str); const gchar * empathy_message_type_to_str (EmpathyMessageType type); diff --git a/libempathy/empathy-presence.c b/libempathy/empathy-presence.c index b30fa6151..b7beb3900 100644 --- a/libempathy/empathy-presence.c +++ b/libempathy/empathy-presence.c @@ -38,7 +38,7 @@ typedef struct _EmpathyPresencePriv EmpathyPresencePriv; struct _EmpathyPresencePriv { McPresence state; gchar *status; - EmpathyTime timestamp; + time_t timestamp; }; static void presence_finalize (GObject *object); diff --git a/libempathy/empathy-time.c b/libempathy/empathy-time.c index 0851add49..9eec8adc0 100644 --- a/libempathy/empathy-time.c +++ b/libempathy/empathy-time.c @@ -30,7 +30,7 @@ /* Note: EmpathyTime is always in UTC. */ -EmpathyTime +time_t empathy_time_get_current (void) { return time (NULL); @@ -63,7 +63,7 @@ empathy_time_get_local_time (struct tm *tm) /* The format is: "20021209T23:51:30" and is in UTC. 0 is returned on * failure. The alternative format "20021209" is also accepted. */ -EmpathyTime +time_t empathy_time_parse (const gchar *str) { struct tm tm; @@ -88,8 +88,8 @@ empathy_time_parse (const gchar *str) /* Converts the UTC timestamp to a string, also in UTC. Returns NULL on failure. */ gchar * -empathy_time_to_string_utc (EmpathyTime t, - const gchar *format) +empathy_time_to_string_utc (time_t t, + const gchar *format) { gchar stamp[128]; struct tm *tm; @@ -106,8 +106,8 @@ empathy_time_to_string_utc (EmpathyTime t, /* Converts the UTC timestamp to a string, in local time. Returns NULL on failure. */ gchar * -empathy_time_to_string_local (EmpathyTime t, - const gchar *format) +empathy_time_to_string_local (time_t t, + const gchar *format) { gchar stamp[128]; struct tm *tm; diff --git a/libempathy/empathy-time.h b/libempathy/empathy-time.h index debf784c0..560b4655a 100644 --- a/libempathy/empathy-time.h +++ b/libempathy/empathy-time.h @@ -33,18 +33,15 @@ G_BEGIN_DECLS #define EMPATHY_TIME_FORMAT_DISPLAY_SHORT "%H:%M" #define EMPATHY_TIME_FORMAT_DISPLAY_LONG "%a %d %b %Y" -/* Note: Always in UTC. */ -typedef long EmpathyTime; - -EmpathyTime empathy_time_get_current (void); -time_t empathy_time_get_local_time (struct tm *tm); -EmpathyTime empathy_time_parse (const gchar *str); -EmpathyTime empathy_time_parse_format (const gchar *str, - const gchar *format); -gchar *empathy_time_to_string_utc (EmpathyTime t, - const gchar *format); -gchar *empathy_time_to_string_local (EmpathyTime t, - const gchar *format); +time_t empathy_time_get_current (void); +time_t empathy_time_get_local_time (struct tm *tm); +time_t empathy_time_parse (const gchar *str); +time_t empathy_time_parse_format (const gchar *str, + const gchar *format); +gchar *empathy_time_to_string_utc (time_t t, + const gchar *format); +gchar *empathy_time_to_string_local (time_t t, + const gchar *format); G_END_DECLS diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index feba273bd..98b82e138 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -940,7 +940,7 @@ tp_chat_build_message (EmpathyTpChat *chat, empathy_message_set_type (message, type); empathy_message_set_sender (message, sender); empathy_message_set_receiver (message, priv->user); - empathy_message_set_timestamp (message, (EmpathyTime) timestamp); + empathy_message_set_timestamp (message, timestamp); g_object_unref (sender); |