Hello community, here is the log from the commit of package empathy for openSUSE:Factory checked in at Fri Feb 6 22:22:53 CET 2009. -------- --- GNOME/empathy/empathy.changes 2008-10-21 12:50:14.000000000 +0200 +++ empathy/empathy.changes 2009-01-08 01:30:39.000000000 +0100 @@ -1,0 +2,45 @@ +Thu Jan 8 11:13:12 EST 2009 - mboman@suse.de + +- Update to version 2.25.4: + + Add sound notifications using libcanberra-gtk + + Translation updates + +------------------------------------------------------------------- +Mon Dec 29 08:35:38 EST 2008 - mboman@suse.de + +- Update to version 2.25.3: + + Refactor EmpathyChatView to make possible to use other backends than + GtkTextView. Required to use Webkit and adium themes + + Use gi18n-lib.h instead of gi18n.h for libraries + + Add empathy_init(), empathy_gtk_init(). They have to be called by any + process using libempathy and libempathy-gtk + + Do not make allow to add a contact to accounts that do not have contact + list, like IRC or SIP + + Improve URI regex + + Drop libgnomeui dependency + + Use GTK+ 2.14.0 and gtk_show_uri + + Fixed bgo#552296, Autocompletion on contact names for "new message" + dialog box + + Fixed bgo#562873, doesn't build with werror on x86_64 + + Fixed bgo#563713, linkifies "@name", and captures the next word + + Use GRegex instead of custom code and use a new regex to detect URIs + + Replace Q_() with C_() for translation context + + Add file transfer support + + Use markup for chat-window tooltips + + Convert avatar to fit the resolution and size requirements + + Fixed bgo#554938, Misspelled word in docs, help/C/empathy.xml:114 + + Fixed bgo#496100, Invites to Chat Rooms unimplemented + + Fixed bgo#541060, import accounts from Pidgin when first run + + Fixed bgo#542176, EmpathyChatroomManager doesn't contain active chat + rooms + + Fixed bgo#558370, empathy do not link on os x 10.5 + + Fixed bgo#560387, Crash when joining a chatroom + + Fixed bgo#560611, Cannot distinguish IRC chats: They all have the label + "Conversation" + + Fixed bgo#560622, Show account name in conversation label + + Fixed bgo#562071, Empathy logview crashes if no accout exitsts + + Fixed bgo#562588, Bugfix for the compile time + libempathy/empathy-dispatcher.c +- Respin empathy-lockdown.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- empathy-2.24.1.tar.bz2 New: ---- empathy-2.25.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ empathy.spec ++++++ --- /var/tmp/diff_new_pack.Q24877/_old 2009-02-06 22:16:20.000000000 +0100 +++ /var/tmp/diff_new_pack.Q24877/_new 2009-02-06 22:16:20.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package empathy (Version 2.24.1) +# spec file for package empathy (Version 2.25.4) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,6 +23,7 @@ BuildRequires: gtk2-devel >= 2.12 BuildRequires: glib2-devel >= 2.15.5 BuildRequires: libglade2-devel +BuildRequires: libcanberra-devel BuildRequires: evolution-data-server-devel BuildRequires: gnome-panel-devel >= 2.10.0 BuildRequires: telepathy-mission-control-devel >= 4.61 @@ -37,10 +38,11 @@ License: GPL v2 or later Group: Productivity/Networking/Instant Messenger AutoReqProv: on -Version: 2.24.1 +Version: 2.25.4 Release: 1 Summary: Empathy GNOME Instant Messenger Source: %{name}-%{version}.tar.bz2 +# PATCH-FEATURE-OPENSUSE lockdown.patch bgo569578 -- Sent upstream for discussion Patch1: lockdown.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: telepathy-stream-engine @@ -155,6 +157,45 @@ %files lang -f %{name}.lang %changelog +* Thu Jan 08 2009 mboman@suse.de +- Update to version 2.25.4: + + Add sound notifications using libcanberra-gtk + + Translation updates +* Mon Dec 29 2008 mboman@suse.de +- Update to version 2.25.3: + + Refactor EmpathyChatView to make possible to use other backends than + GtkTextView. Required to use Webkit and adium themes + + Use gi18n-lib.h instead of gi18n.h for libraries + + Add empathy_init(), empathy_gtk_init(). They have to be called by any + process using libempathy and libempathy-gtk + + Do not make allow to add a contact to accounts that do not have contact + list, like IRC or SIP + + Improve URI regex + + Drop libgnomeui dependency + + Use GTK+ 2.14.0 and gtk_show_uri + + Fixed bgo#552296, Autocompletion on contact names for "new message" + dialog box + + Fixed bgo#562873, doesn't build with werror on x86_64 + + Fixed bgo#563713, linkifies "@name", and captures the next word + + Use GRegex instead of custom code and use a new regex to detect URIs + + Replace Q_() with C_() for translation context + + Add file transfer support + + Use markup for chat-window tooltips + + Convert avatar to fit the resolution and size requirements + + Fixed bgo#554938, Misspelled word in docs, help/C/empathy.xml:114 + + Fixed bgo#496100, Invites to Chat Rooms unimplemented + + Fixed bgo#541060, import accounts from Pidgin when first run + + Fixed bgo#542176, EmpathyChatroomManager doesn't contain active chat + rooms + + Fixed bgo#558370, empathy do not link on os x 10.5 + + Fixed bgo#560387, Crash when joining a chatroom + + Fixed bgo#560611, Cannot distinguish IRC chats: They all have the label + "Conversation" + + Fixed bgo#560622, Show account name in conversation label + + Fixed bgo#562071, Empathy logview crashes if no accout exitsts + + Fixed bgo#562588, Bugfix for the compile time + libempathy/empathy-dispatcher.c +- Respin empathy-lockdown.patch * Tue Oct 21 2008 mboman@suse.de - Update to version 2.24.1: + Fixed bgo#544029, empathy's configure.ac doesn't detect python 2.6 ++++++ empathy-2.24.1.tar.bz2 -> empathy-2.25.4.tar.bz2 ++++++ ++++ 70966 lines of diff (skipped) ++++++ lockdown.patch ++++++ --- /var/tmp/diff_new_pack.Q24877/_old 2009-02-06 22:16:25.000000000 +0100 +++ /var/tmp/diff_new_pack.Q24877/_new 2009-02-06 22:16:25.000000000 +0100 @@ -1,7 +1,95 @@ -Index: libempathy-gtk/empathy-presence-chooser.c -=================================================================== ---- libempathy-gtk/empathy-presence-chooser.c (revision 1492) -+++ libempathy-gtk/empathy-presence-chooser.c (working copy) +--- ./src/empathy-main-window.c.org 2008-12-29 08:51:32.000000000 +1100 ++++ ./src/empathy-main-window.c 2008-12-29 08:52:15.000000000 +1100 +@@ -430,6 +430,31 @@ empathy_main_window_show (void) + "help_contents", "activate", main_window_help_contents_cb, + NULL); + ++ /* If adding new contacts is locked down, don't show that menu item */ ++ gboolean disable_new_contacts; ++ empathy_conf_get_bool (empathy_conf_get (), ++ EMPATHY_PREFS_LOCKDOWN_NEW_CONTACTS, ++ &disable_new_contacts); ++ if (disable_new_contacts) ++ { ++ GtkWidget * hide_w = glade_xml_get_widget (glade, "chat_add_contact"); ++ gtk_widget_hide (hide_w); ++ hide_w = glade_xml_get_widget (glade, "separator_before_add_contact"); ++ gtk_widget_hide (hide_w); ++ } ++ ++ /* If logging is disabled, don't show that menu item */ ++ gboolean disable_history; ++ empathy_conf_get_bool (empathy_conf_get (), ++ EMPATHY_PREFS_CHAT_DISABLE_LOGGING, ++ &disable_history); ++ if (disable_history) ++ { ++ GtkWidget * hide_w = glade_xml_get_widget (glade, "chat_history"); ++ gtk_widget_set_sensitive (hide_w, FALSE); ++ gtk_widget_hide (hide_w); ++ } ++ + /* Set up connection related widgets. */ + main_window_connection_items_setup (window, glade); + g_object_unref (glade); +--- ./src/empathy-main-window.glade.org 2008-12-29 08:52:31.000000000 +1100 ++++ ./src/empathy-main-window.glade 2008-12-29 08:53:02.000000000 +1100 +@@ -51,7 +51,7 @@ + </widget> + </child> + <child> +- <widget class="GtkSeparatorMenuItem" id="separator5"> ++ <widget class="GtkSeparatorMenuItem" id="separator_before_add_contact"> + <property name="visible">True</property> + </widget> + </child> +--- ./libempathy-gtk/empathy-contact-dialogs.c.org 2008-12-29 08:45:50.000000000 +1100 ++++ ./libempathy-gtk/empathy-contact-dialogs.c 2008-12-29 08:47:43.000000000 +1100 +@@ -34,6 +34,7 @@ + #include <libempathy/empathy-contact-list.h> + #include <libempathy/empathy-utils.h> + ++#include "empathy-conf.h" + #include "empathy-contact-dialogs.h" + #include "empathy-contact-widget.h" + #include "empathy-ui-utils.h" +@@ -172,6 +173,15 @@ empathy_contact_information_dialog_show + return; + } + ++ gboolean disable_new_contacts; ++ empathy_conf_get_bool (empathy_conf_get (), ++ EMPATHY_PREFS_LOCKDOWN_NEW_CONTACTS, ++ &disable_new_contacts); ++ ++ if (disable_new_contacts) ++ return; ++ ++ + /* Create dialog */ + dialog = gtk_dialog_new (); + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); +--- ./libempathy-gtk/empathy-conf.h.org 2008-12-29 08:47:59.000000000 +1100 ++++ ./libempathy-gtk/empathy-conf.h 2008-12-29 08:48:59.000000000 +1100 +@@ -55,6 +55,7 @@ struct _EmpathyConfClass { + #define EMPATHY_PREFS_CHAT_SPELL_CHECKER_ENABLED EMPATHY_PREFS_PATH "/conversation/spell_checker_enabled" + #define EMPATHY_PREFS_CHAT_NICK_COMPLETION_CHAR EMPATHY_PREFS_PATH "/conversation/nick_completion_char" + #define EMPATHY_PREFS_CHAT_AVATAR_IN_ICON EMPATHY_PREFS_PATH "/conversation/avatar_in_icon" ++#define EMPATHY_PREFS_CHAT_DISABLE_LOGGING EMPATHY_PREFS_PATH "/conversation/disable_logging" + #define EMPATHY_PREFS_UI_SEPARATE_CHAT_WINDOWS EMPATHY_PREFS_PATH "/ui/separate_chat_windows" + #define EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN EMPATHY_PREFS_PATH "/ui/main_window_hidden" + #define EMPATHY_PREFS_UI_AVATAR_DIRECTORY EMPATHY_PREFS_PATH "/ui/avatar_directory" +@@ -66,6 +67,8 @@ struct _EmpathyConfClass { + #define EMPATHY_PREFS_SALUT_ACCOUNT_CREATED EMPATHY_PREFS_PATH "/accounts/salut_created" + #define EMPATHY_PREFS_USE_NM EMPATHY_PREFS_PATH "/use_nm" + #define EMPATHY_PREFS_AUTOCONNECT EMPATHY_PREFS_PATH "/autoconnect" ++#define EMPATHY_PREFS_LOCKDOWN_CUSTOM_MSGS EMPATHY_PREFS_PATH "/lockdown/disable_custom_away_messages" ++#define EMPATHY_PREFS_LOCKDOWN_NEW_CONTACTS EMPATHY_PREFS_PATH "/lockdown/disable_new_contacts" + #define EMPATHY_PREFS_IMPORT_ASKED EMPATHY_PREFS_PATH "/import_asked" + #define EMPATHY_PREFS_FILE_TRANSFER_DEFAULT_FOLDER EMPATHY_PREFS_PATH "/file_transfer/default_folder" + +--- ./libempathy-gtk/empathy-presence-chooser.c.org 2008-12-29 08:43:32.000000000 +1100 ++++ ./libempathy-gtk/empathy-presence-chooser.c 2008-12-29 08:45:38.000000000 +1100 @@ -38,6 +38,7 @@ #include <libempathy/empathy-utils.h> #include <libempathy/empathy-status-presets.h> @@ -10,7 +98,7 @@ #include "empathy-ui-utils.h" #include "empathy-images.h" #include "empathy-presence-chooser.h" -@@ -676,24 +677,32 @@ +@@ -676,24 +677,32 @@ empathy_presence_chooser_create_menu (vo } @@ -18,10 +106,10 @@ - item = gtk_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - gtk_widget_show (item); -+ gboolean disable_custom_msgs; -+ empathy_conf_get_bool (empathy_conf_get (), -+ EMPATHY_PREFS_LOCKDOWN_CUSTOM_MSGS, -+ &disable_custom_msgs); ++ gboolean disable_custom_msgs; ++ empathy_conf_get_bool (empathy_conf_get (), ++ EMPATHY_PREFS_LOCKDOWN_CUSTOM_MSGS, ++ &disable_custom_msgs); /* Custom messages */ - item = gtk_image_menu_item_new_with_label (_("Custom messages...")); @@ -30,94 +118,46 @@ - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - gtk_widget_show (image); - gtk_widget_show (item); -+ if (!disable_custom_msgs) -+ { -+ /* Separator. */ -+ item = gtk_menu_item_new (); -+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); -+ gtk_widget_show (item); - +- - g_signal_connect (item, - "activate", - G_CALLBACK (presence_chooser_custom_activate_cb), - NULL); -+ item = gtk_image_menu_item_new_with_label (_("Custom messages...")); -+ image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU); -+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); -+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); -+ gtk_widget_show (image); -+ gtk_widget_show (item); - -+ g_signal_connect (item, -+ "activate", -+ G_CALLBACK (presence_chooser_custom_activate_cb), -+ NULL); -+ } -+ +- ++ if (!disable_custom_msgs) ++ { ++ /* Separator. */ ++ item = gtk_menu_item_new (); ++ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); ++ gtk_widget_show (item); ++ ++ item = gtk_image_menu_item_new_with_label (_("Custom messages...")); ++ image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU); ++ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); ++ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); ++ gtk_widget_show (image); ++ gtk_widget_show (item); ++ ++ g_signal_connect (item, ++ "activate", ++ G_CALLBACK (presence_chooser_custom_activate_cb), ++ NULL); ++ } ++ return menu; } -Index: libempathy-gtk/empathy-contact-dialogs.c -=================================================================== ---- libempathy-gtk/empathy-contact-dialogs.c (revision 1492) -+++ libempathy-gtk/empathy-contact-dialogs.c (working copy) -@@ -34,6 +34,7 @@ - #include <libempathy/empathy-contact-list.h> - #include <libempathy/empathy-utils.h> - -+#include "empathy-conf.h" - #include "empathy-contact-dialogs.h" - #include "empathy-contact-widget.h" - #include "empathy-ui-utils.h" -@@ -300,6 +301,14 @@ - return; - } - -+ gboolean disable_new_contacts; -+ empathy_conf_get_bool (empathy_conf_get (), -+ EMPATHY_PREFS_LOCKDOWN_NEW_CONTACTS, -+ &disable_new_contacts); -+ -+ if (disable_new_contacts) -+ return; -+ - /* Create dialog */ - dialog = gtk_dialog_new (); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); -Index: libempathy-gtk/empathy-conf.h -=================================================================== ---- libempathy-gtk/empathy-conf.h (revision 1492) -+++ libempathy-gtk/empathy-conf.h (working copy) -@@ -55,6 +55,7 @@ - #define EMPATHY_PREFS_CHAT_SPELL_CHECKER_ENABLED EMPATHY_PREFS_PATH "/conversation/spell_checker_enabled" - #define EMPATHY_PREFS_CHAT_NICK_COMPLETION_CHAR EMPATHY_PREFS_PATH "/conversation/nick_completion_char" - #define EMPATHY_PREFS_CHAT_AVATAR_IN_ICON EMPATHY_PREFS_PATH "/conversation/avatar_in_icon" -+#define EMPATHY_PREFS_CHAT_DISABLE_LOGGING EMPATHY_PREFS_PATH "/conversation/disable_logging" - #define EMPATHY_PREFS_UI_SEPARATE_CHAT_WINDOWS EMPATHY_PREFS_PATH "/ui/separate_chat_windows" - #define EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN EMPATHY_PREFS_PATH "/ui/main_window_hidden" - #define EMPATHY_PREFS_UI_AVATAR_DIRECTORY EMPATHY_PREFS_PATH "/ui/avatar_directory" -@@ -66,6 +67,8 @@ - #define EMPATHY_PREFS_SALUT_ACCOUNT_CREATED EMPATHY_PREFS_PATH "/accounts/salut_created" - #define EMPATHY_PREFS_USE_NM EMPATHY_PREFS_PATH "/use_nm" - #define EMPATHY_PREFS_AUTOCONNECT EMPATHY_PREFS_PATH "/autoconnect" -+#define EMPATHY_PREFS_LOCKDOWN_CUSTOM_MSGS EMPATHY_PREFS_PATH "/lockdown/disable_custom_away_messages" -+#define EMPATHY_PREFS_LOCKDOWN_NEW_CONTACTS EMPATHY_PREFS_PATH "/lockdown/disable_new_contacts" - - typedef void (*EmpathyConfNotifyFunc) (EmpathyConf *conf, - const gchar *key, -Index: libempathy-gtk/empathy-chat.c -=================================================================== ---- libempathy-gtk/empathy-chat.c (revision 1492) -+++ libempathy-gtk/empathy-chat.c (working copy) -@@ -80,6 +80,7 @@ - gpointer token; +--- libempathy-gtk/empathy-chat.c.org 2009-01-08 11:25:39.000000000 +1100 ++++ libempathy-gtk/empathy-chat.c 2009-01-08 11:27:30.000000000 +1100 +@@ -81,6 +81,7 @@ typedef struct { + TpHandleType handle_type; gint contacts_width; gboolean has_input_vscroll; + gboolean enable_logging; GtkWidget *widget; GtkWidget *hpaned; -@@ -464,7 +465,7 @@ +@@ -465,7 +466,7 @@ chat_message_received_cb (EmpathyTpChat empathy_contact_get_name (sender), empathy_contact_get_handle (sender)); @@ -126,65 +166,16 @@ gboolean is_chatroom; is_chatroom = priv->handle_type == TP_HANDLE_TYPE_ROOM; -@@ -1527,6 +1528,12 @@ +@@ -1532,6 +1533,12 @@ empathy_chat_init (EmpathyChat *chat) priv->sent_messages_index = -1; - priv->mc = empathy_mission_control_new (); + priv->account_manager = empathy_account_manager_dup_singleton (); + gboolean disable_logging; + empathy_conf_get_bool (empathy_conf_get (), -+ EMPATHY_PREFS_CHAT_DISABLE_LOGGING, -+ &disable_logging); ++ EMPATHY_PREFS_CHAT_DISABLE_LOGGING, ++ &disable_logging); + priv->enable_logging = !disable_logging; + - priv->token = empathy_connect_to_account_status_changed (priv->mc, - G_CALLBACK (chat_status_changed_cb), - chat, NULL); -Index: src/empathy-main-window.c -=================================================================== ---- src/empathy-main-window.c (revision 1492) -+++ src/empathy-main-window.c (working copy) -@@ -430,6 +430,31 @@ - "help_contents", "activate", main_window_help_contents_cb, - NULL); - -+ /* If adding new contacts is locked down, don't show that menu item */ -+ gboolean disable_new_contacts; -+ empathy_conf_get_bool (empathy_conf_get (), -+ EMPATHY_PREFS_LOCKDOWN_NEW_CONTACTS, -+ &disable_new_contacts); -+ if (disable_new_contacts) -+ { -+ GtkWidget * hide_w = glade_xml_get_widget (glade, "chat_add_contact"); -+ gtk_widget_hide (hide_w); -+ hide_w = glade_xml_get_widget (glade, "separator_before_add_contact"); -+ gtk_widget_hide (hide_w); -+ } -+ -+ /* If logging is disabled, don't show that menu item */ -+ gboolean disable_history; -+ empathy_conf_get_bool (empathy_conf_get (), -+ EMPATHY_PREFS_CHAT_DISABLE_LOGGING, -+ &disable_history); -+ if (disable_history) -+ { -+ GtkWidget * hide_w = glade_xml_get_widget (glade, "chat_history"); -+ gtk_widget_set_sensitive (hide_w, FALSE); -+ gtk_widget_hide (hide_w); -+ } -+ - /* Set up connection related widgets. */ - main_window_connection_items_setup (window, glade); - g_object_unref (glade); -Index: src/empathy-main-window.glade -=================================================================== ---- src/empathy-main-window.glade (revision 1492) -+++ src/empathy-main-window.glade (working copy) -@@ -51,7 +51,7 @@ - </widget> - </child> - <child> -- <widget class="GtkSeparatorMenuItem" id="separator5"> -+ <widget class="GtkSeparatorMenuItem" id="separator_before_add_contact"> - <property name="visible">True</property> - </widget> - </child> + g_signal_connect (priv->account_manager, + "account-connection-changed", + G_CALLBACK (chat_connection_changed_cb), ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org