commit empathy for openSUSE:Factory
Hello community, here is the log from the commit of package empathy for openSUSE:Factory checked in at Wed Mar 25 19:30:39 CET 2009. -------- --- GNOME/empathy/empathy.changes 2009-03-06 14:23:38.000000000 +0100 +++ empathy/empathy.changes 2009-03-17 17:48:19.000000000 +0100 @@ -1,0 +2,20 @@ +Mon Mar 16 22:52:00 CET 2009 - mboman@suse.de + +- Update to version 2.26.0: + + Fix various VoIP bugs + + Hook up audio mute button + + Set the camera button sensitive while connected and there is a + video input + + Set empathy's media role to phone for so pulse can do policy on + it + + Refactor log backend, it now make possible to implement other + backends to read logs from other clients, and it logs messages + sooner to avoid losing messages if empathy crash at any time + + Translation updates +- Update lockdown.patch (sent changes upstream) +- Don't package omf files twice (they are in the lang package too). +- Remove glib2-devel and gtk-doc from BuildRequires +- Remove libxml2-devel from Requires in -devel package +- Replace %setup -q -n %{name}-%{version} with %setup -q + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- empathy-2.25.92.tar.bz2 New: ---- empathy-2.26.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ empathy.spec ++++++ --- /var/tmp/diff_new_pack.hM8079/_old 2009-03-25 19:17:24.000000000 +0100 +++ /var/tmp/diff_new_pack.hM8079/_new 2009-03-25 19:17:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package empathy (Version 2.25.92) +# spec file for package empathy (Version 2.26.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,27 +20,25 @@ Name: empathy BuildRequires: gnome-common -BuildRequires: gtk2-devel >= 2.12 -BuildRequires: glib2-devel >= 2.15.5 +BuildRequires: gtk2-devel BuildRequires: fdupes BuildRequires: libglade2-devel BuildRequires: libcanberra-devel BuildRequires: libnotify-devel BuildRequires: evolution-data-server-devel -BuildRequires: gnome-panel-devel >= 2.10.0 -BuildRequires: telepathy-mission-control-devel >= 4.61 +BuildRequires: gnome-panel-devel +BuildRequires: telepathy-mission-control-devel BuildRequires: telepathy-farsight-devel -BuildRequires: telepathy-glib-devel >= 0.7.7 -BuildRequires: gtk-doc +BuildRequires: telepathy-glib-devel BuildRequires: intltool -BuildRequires: gnome-doc-utils-devel >= 0.3.2 +BuildRequires: gnome-doc-utils-devel BuildRequires: update-desktop-files BuildRequires: python-gtk-devel BuildRequires: python-xml Url: http://live.gnome.org/Empathy License: GPL v2 or later Group: Productivity/Networking/Instant Messenger -Version: 2.25.92 +Version: 2.26.0 Release: 1 Summary: Empathy GNOME Instant Messenger Source: %{name}-%{version}.tar.bz2 @@ -69,10 +67,10 @@ %package devel License: GPL v2 or later Requires: %{name} = %{version}-%{release} -Requires: glib2-devel -Requires: libglade2-devel, gtk2-devel -Requires: telepathy-mission-control-devel >= 4.53 -Requires: libxml2-devel, libtelepathy-devel >= 0.3.1 +Requires: gtk2-devel +Requires: libglade2-devel +Requires: libtelepathy-devel +Requires: telepathy-mission-control-devel Summary: Empathy IM Application Framework Group: Development/Libraries/GNOME @@ -92,11 +90,14 @@ %lang_package %prep -%setup -q -n %{name}-%{version} +%setup -q %patch1 -p0 %build -%configure --disable-static --with-pic --with-compile-warnings=yes --enable-voip --enable-python=yes\ +%configure --disable-static \ + --with-pic \ + --enable-voip \ + --enable-python=yes \ --disable-scrollkeeper make %{?jobs:-j%jobs} @@ -136,7 +137,6 @@ %{_datadir}/applications/* %{_datadir}/empathy/ %{_datadir}/mission-control/ -%{_datadir}/omf/empathy/ %{_mandir}/man1/* %files devel @@ -149,6 +149,23 @@ %files lang -f %{name}.lang %changelog +* Mon Mar 16 2009 mboman@suse.de +- Update to version 2.26.0: + + Fix various VoIP bugs + + Hook up audio mute button + + Set the camera button sensitive while connected and there is a + video input + + Set empathy's media role to phone for so pulse can do policy on + it + + Refactor log backend, it now make possible to implement other + backends to read logs from other clients, and it logs messages + sooner to avoid losing messages if empathy crash at any time + + Translation updates +- Update lockdown.patch (sent changes upstream) +- Don't package omf files twice (they are in the lang package too). +- Remove glib2-devel and gtk-doc from BuildRequires +- Remove libxml2-devel from Requires in -devel package +- Replace %%setup -q -n %%{name}-%%{version} with %%setup -q * Fri Mar 06 2009 vuntz@novell.com - Update to version 2.25.92: + Hardcode some a default codec preferences ++++++ empathy-2.25.92.tar.bz2 -> empathy-2.26.0.tar.bz2 ++++++ ++++ 61940 lines of diff (skipped) ++++++ lockdown.patch ++++++ --- /var/tmp/diff_new_pack.hM8079/_old 2009-03-25 19:17:29.000000000 +0100 +++ /var/tmp/diff_new_pack.hM8079/_new 2009-03-25 19:17:29.000000000 +0100 @@ -1,50 +1,62 @@ ---- ./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); +Index: libempathy-gtk/empathy-chat.c +=================================================================== +--- libempathy-gtk/empathy-chat.c.orig ++++ libempathy-gtk/empathy-chat.c +@@ -83,6 +83,7 @@ typedef struct { + TpHandleType handle_type; + gint contacts_width; + gboolean has_input_vscroll; ++ gboolean enable_logging; -+ /* 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 + GtkWidget *widget; + GtkWidget *hpaned; +@@ -1052,7 +1053,7 @@ chat_add_logs (EmpathyChat *chat) + gboolean is_chatroom; + GList *messages, *l; + +- if (!priv->id) { ++ if (!priv->id && !priv->enable_logging) { + return; + } + +@@ -1564,6 +1565,12 @@ empathy_chat_init (EmpathyChat *chat) + priv->sent_messages_index = -1; + 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); ++ priv->enable_logging = !disable_logging; ++ + g_signal_connect (priv->account_manager, + "account-connection-changed", + G_CALLBACK (chat_connection_changed_cb), +Index: libempathy-gtk/empathy-conf.h +=================================================================== +--- libempathy-gtk/empathy-conf.h.orig ++++ libempathy-gtk/empathy-conf.h +@@ -64,6 +64,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" +@@ -75,6 +76,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" + +Index: libempathy-gtk/empathy-contact-dialogs.c +=================================================================== +--- libempathy-gtk/empathy-contact-dialogs.c.orig ++++ libempathy-gtk/empathy-contact-dialogs.c @@ -34,6 +34,7 @@ #include <libempathy/empathy-contact-list.h> #include <libempathy/empathy-utils.h> @@ -69,27 +81,10 @@ /* 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 +Index: libempathy-gtk/empathy-presence-chooser.c +=================================================================== +--- libempathy-gtk/empathy-presence-chooser.c.orig ++++ libempathy-gtk/empathy-presence-chooser.c @@ -38,6 +38,7 @@ #include <libempathy/empathy-utils.h> #include <libempathy/empathy-status-presets.h> @@ -147,35 +142,52 @@ return menu; } ---- 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; -@@ -465,7 +466,7 @@ chat_message_received_cb (EmpathyTpChat - empathy_contact_get_name (sender), - empathy_contact_get_handle (sender)); - -- if (priv->id) { -+ if (priv->id && priv->enable_logging) { - gboolean is_chatroom; - - is_chatroom = priv->handle_type == TP_HANDLE_TYPE_ROOM; -@@ -1532,6 +1533,12 @@ empathy_chat_init (EmpathyChat *chat) - priv->sent_messages_index = -1; - priv->account_manager = empathy_account_manager_dup_singleton (); +Index: src/empathy-main-window.c +=================================================================== +--- src/empathy-main-window.c.orig ++++ src/empathy-main-window.c +@@ -556,6 +556,31 @@ empathy_main_window_show (void) + "help_contents", "activate", main_window_help_contents_cb, + NULL); -+ gboolean disable_logging; -+ empathy_conf_get_bool (empathy_conf_get (), -+ EMPATHY_PREFS_CHAT_DISABLE_LOGGING, -+ &disable_logging); -+ priv->enable_logging = !disable_logging; -+ - g_signal_connect (priv->account_manager, - "account-connection-changed", - G_CALLBACK (chat_connection_changed_cb), ++ /* 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.orig ++++ src/empathy-main-window.glade +@@ -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> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠Hilbert.suse.de