+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:
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)
@callback:
@user_data:
-@tooltips:
@Returns:
@contact:
@parent:
@edit:
+@edit_groups:
<!-- ##### FUNCTION empathy_new_contact_dialog_show ##### -->
<!-- ##### 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>
</para>
@contact:
-@type:
+@flags:
@Returns:
@Varargs:
-<!-- ##### FUNCTION empathy_pixbuf_from_icon_name ##### -->
-<para>
-
-</para>
-
-@icon_name:
-@icon_size:
-@Returns:
-
-
<!-- ##### FUNCTION empathy_icon_name_from_account ##### -->
<para>
@Returns:
+<!-- ##### FUNCTION empathy_pixbuf_from_data ##### -->
+<para>
+
+</para>
+
+@data:
+@data_size:
+@Returns:
+
+
<!-- ##### FUNCTION empathy_pixbuf_from_avatar_scaled ##### -->
<para>
@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>
-<!-- ##### TYPEDEF EmpathyTime ##### -->
-<para>
-
-</para>
-
-
<!-- ##### FUNCTION empathy_time_get_current ##### -->
<para>
}
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;
GtkWidget *
empathy_chat_view_get_smiley_menu (GCallback callback,
- gpointer user_data,
- GtkTooltips *tooltips)
+ gpointer user_data)
{
EmpathySmileyManager *smiley_manager;
GSList *smileys, *l;
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);
#define __EMPATHY_CHAT_VIEW_H__
#include <gtk/gtktextview.h>
-#include <gtk/gtktooltips.h>
#include <libempathy/empathy-contact.h>
#include <libempathy/empathy-message.h>
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);
GtkWidget *dialog;
GtkWidget *notebook;
- GtkTooltips *tooltips;
-
/* Menu items. */
GtkWidget *menu_conv_clear;
GtkWidget *menu_conv_insert_smiley;
priv = GET_PRIV (window);
- priv->tooltips = g_object_ref_sink (gtk_tooltips_new ());
-
glade = empathy_glade_get_file ("empathy-chat.glade",
"chat_window",
NULL,
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);
/* 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
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,
}
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);
}
EmpathyLogManager *log_manager;
EmpathyTpChat *tp_chat;
EmpathyChatWindow *window;
- GtkTooltips *tooltips;
guint composing_stop_timeout_id;
gboolean sensitive;
gchar *id;
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.
*/
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;
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);
{
EmpathyChatPriv *priv;
EmpathyContact *sender;
- EmpathyTime timestamp;
+ time_t timestamp;
priv = GET_PRIV (chat);
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. */
GtkWidget *window;
GtkWidget *main_vbox;
- /* Tooltips for all widgets */
- GtkTooltips *tooltips;
-
/* Menu widgets */
GtkWidget *room;
GtkWidget *room_menu;
GtkWidget *show_offline_widget;
GtkWidget *ebox;
GtkToolItem *item;
- gchar *str;
gboolean show_offline;
gboolean show_avatars;
gboolean compact_contact_list;
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),
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",
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);
EmpathyMessage *message;
EmpathyContact *sender;
gchar *time;
- EmpathyTime t;
+ time_t t;
gchar *sender_id;
gchar *sender_name;
gchar *body;
gchar *
empathy_log_manager_get_date_readable (const gchar *date)
{
- EmpathyTime t;
+ time_t t;
t = empathy_time_parse (date);
static gchar *
log_manager_get_timestamp_filename (void)
{
- EmpathyTime t;
+ time_t t;
gchar *time_str;
gchar *filename;
static gchar *
log_manager_get_timestamp_from_message (EmpathyMessage *message)
{
- EmpathyTime t;
+ time_t t;
t = empathy_message_get_timestamp (message);
EmpathyContact *sender;
EmpathyContact *receiver;
gchar *body;
- EmpathyTime timestamp;
+ time_t timestamp;
};
static void empathy_message_class_init (EmpathyMessageClass *class);
g_object_notify (G_OBJECT (message), "body");
}
-EmpathyTime
+time_t
empathy_message_get_timestamp (EmpathyMessage *message)
{
EmpathyMessagePriv *priv;
void
empathy_message_set_timestamp (EmpathyMessage *message,
- EmpathyTime timestamp)
+ time_t timestamp)
{
EmpathyMessagePriv *priv;
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);
struct _EmpathyPresencePriv {
McPresence state;
gchar *status;
- EmpathyTime timestamp;
+ time_t timestamp;
};
static void presence_finalize (GObject *object);
/* Note: EmpathyTime is always in UTC. */
-EmpathyTime
+time_t
empathy_time_get_current (void)
{
return time (NULL);
/* 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;
/* 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;
/* 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;
#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
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);
projects / empathy.git / commitdiff