...
 
Commits (60)
NEW in 2.32.2 (18/11/2010)
=============
This release adds a '--with-ca-file' option to configure.
The default is to use the normal location for either Red Hat
or Debian, or fail if neither exists. Use --with-ca-file to force a
particular location (e.g. if your build system doesn't guarantee to have
the CA certificate bundle installed), or use --without-ca-file if your system
doesn't have a standard CA certificate store.
Two memory leaks have also been fixed which should drastically reduce empathy's
memory consumption on longer runs.
Bugs fixed:
- Fixed #634197, [Patch] Make CA cert paths configurable (Brian Pepple)
NEW in 2.32.1 (15/11/2010)
=============
This release fixes some minor issues and updates a few translations.
Bugs fixed:
- Fixed #631657, Empathy doesn't build with gcr-3 (Guillaume Desmottes)
- Fixed #632806, Empathy 2.32.x needs to require libnotify < 0.7 (Guillaume Desmottes)
- Fixed #632807, Empathy 2.32.x shouldn't support GTK 3 (Guillaume Desmottes)
- Fixed #631455, window resizes irreversibly when perfoming a contact search (Guillaume Desmottes)
Translations:
- Updated ca Translation (Gil Forcada)
- Updated ca@valencia Translation (Carles Ferrando)
- Updated crh Translation (Reşat SABIQ)
- Updated es Translation (Jorge González)
- Updated et Translation (Mattias Põldaru)
- Updated fi Translation (Ville-Pekka Vainio)
- Updated ja Translation (Takayuki KUSANO)
- Updated ko Translation (Changwoo Ryu)
Documentation translations:
- Updated hu Documentation translation (Gabor Kelemen)
NEW in 2.32.0.1 (04/10/2010)
===============
This release in the stable 2.32 branches fixes various bugs and brings some
small improvements. We suggest distributions shipping GNOME 2.32 to use this version.
If it's too late for you, we strongly recommend that you backport at least these
two patches:
http://git.gnome.org/browse/empathy/commit/?h=gnome-2-32&id=045d3c82deb7d6288c9026c98dc1b836370864ed
without it newly created GTalk accounts won't be able to connect.
http://git.gnome.org/browse/empathy/commit/?h=gnome-2-32&id=6c7d6ae27283e2a54b97198baedfe9c26b812b46
which fixes a crash when trying to connect to some XMPP servers.
Dependencies:
• GTK+ ≥ 2.22.0
Bugs fixed:
- Fixed #631095, auth client crashes when trying to connect (Cosimo Cecchi)
- Fixed #558802, show the "new message" icon regardless of focus, active tab (Guillaume Desmottes)
- Fixed #593437, Should leave fullscreen mode when call is disconnected (Guillaume Desmottes)
- Fixed #629782, doesn't check unique result (Guillaume Desmottes)
- Fixed #629912, Better heuristic to pick default individual (Guillaume Desmottes)
- Fixed #629922, Contacts list window triggers _NET_ACTIVE_WINDOW timestamp error from Metacity (Guillaume Desmottes)
- Fixed #630107, update Empathy to deprecation changes in GTK+ 2.22 (Diego Escalante Urrelo)
- Fixed #630276, Hitting redial doesn't clear error messages (Guillaume Desmottes)
- Fixed #630427, Empathy Loses ContactInfo data it doesn't support in the UI (Guillaume Desmottes)
- Fixed #631098, Always show status icon in contact right-click menu (for meta-contacts)
- Fixed #630544, Refers to a nonexistent UI item (Milo Casagrande)
- Fixed #631049, Recommended SIP provider no longer available (Milo Casagrande)
Translations:
- Updated el Translation (Simos Xenitellis, Giannis Katsampirhs)
- Updated es Translation (Jorge González)
- Updated lt Translation (Žygimantas Beručka)
- Updated nl Translation (Hannie Dumoleyn)
- Updated sv Translation (Daniel Nylander)
Documentation translations:
- Updated el Documentation translation (Michael Kotsarinis)
- Updated hu Documentation translation (Gabor Kelemen)
- Updated it Documentation translation (Milo Casagrande)
NEW in 2.32.0 (27/09/2010)
=============
......
......@@ -3,7 +3,7 @@ m4_define(empathy_released, 0)
m4_define([empathy_major_version], [2])
m4_define([empathy_minor_version], [32])
m4_define([empathy_micro_version], [0])
m4_define([empathy_micro_version], [2])
m4_define([empathy_nano_version], [0])
dnl Display the nano_version only if it's not '0'
......@@ -39,7 +39,6 @@ GTK_REQUIRED=2.22.0
KEYRING_REQUIRED=2.26.0
LIBCANBERRA_GTK_REQUIRED=0.4
LIBNOTIFY_REQUIRED=0.4.4
LIBNOTIFY_REQUIRED_GTK3=0.5.1
TELEPATHY_FARSIGHT_REQUIRED=0.0.14
TELEPATHY_GLIB_REQUIRED=0.11.15
TELEPATHY_LOGGER=0.1.5
......@@ -53,17 +52,10 @@ ISO_CODES_REQUIRED=0.35
LIBCHAMPLAIN_GTK_REQUIRED=0.7.1
LIBCHAMPLAIN_REQUIRED=0.7.1
NAUTILUS_SENDTO_REQUIRED=2.31.7
NAUTILUS_SENDTO_REQUIRED_GTK3=2.90.0
NETWORK_MANAGER_REQUIRED=0.7.0
WEBKIT_REQUIRED=1.1.15
GNOME_CONTROL_CENTER_GTK3_REQUIRED=2.31.4
# Use --enable-maintainer-mode to disable deprecated symbols,
# disable single include and enable GSEAL. If this is not a released empathy,
# maintainer mode is forced
ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
GNOME_MAINTAINER_MODE_DEFINES
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([configure.ac])
......@@ -180,46 +172,23 @@ fi
# -----------------------------------------------------------
# GTK+
# -----------------------------------------------------------
AC_ARG_ENABLE(gtk3,
AS_HELP_STRING([--enable-gtk3=@<:@no/yes/auto@:>@],
[build with GTK+3]), ,
enable_gtk3=auto)
# Try to use GTK+3 if available
if test "x$enable_gtk3" != "xno"; then
PKG_CHECK_MODULES(GTK,
[
gtk+-3.0 >= $GTK_REQUIRED
], have_gtk3="yes", have_gtk3="no")
else
have_gtk3="no"
fi
if test "x$enable_gtk3" = "xyes" -a "x$have_gtk3" != "xyes"; then
AC_MSG_ERROR([Could not find gtk3 dependencies.])
fi
if test "x$have_gtk3" == "xyes"; then
# GTK3 specific deps
PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED)
PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_GTK3)
PKG_CHECK_MODULES(UNIQUE, unique-3.0 >= $UNIQUE_REQUIRED)
PKG_CHECK_MODULES(GCR, gcr-3 >= $KEYRING_REQUIRED)
AC_DEFINE(HAVE_GTK3, 1, [Define if we're compiling against GTK+ 3])
else
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
# GTK2 specific deps
PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED)
PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= $UNIQUE_REQUIRED)
PKG_CHECK_MODULES(GCR, gcr-0 >= $KEYRING_REQUIRED)
# Enable GSEAL checks if needed
if test $USE_MAINTAINER_MODE = yes; then
AC_DEFINE(GSEAL_ENABLE, [], [Seal public structs to force usage of accessors])
fi
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
# GTK2 specific deps
PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED)
# libnotify 0.7 introduced API changes
PKG_CHECK_MODULES(LIBNOTIFY,
libnotify >= $LIBNOTIFY_REQUIRED
libnotify < 0.7)
PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= $UNIQUE_REQUIRED)
# gnome-keyring breaks API in 2.91.x
PKG_CHECK_MODULES(GCR,
gcr-0 >= $KEYRING_REQUIRED
gcr-0 < 2.91)
# Enable GSEAL checks if needed
if test $USE_MAINTAINER_MODE = yes; then
AC_DEFINE(GSEAL_ENABLE, [], [Seal public structs to force usage of accessors])
fi
# -----------------------------------------------------------
......@@ -244,6 +213,35 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
AM_GLIB_GNU_GETTEXT
# -----------------------------------------------------------
# Make CA certificates path configurable
# Stolen from GIO's TLS
# -----------------------------------------------------------
AC_MSG_CHECKING([location of system Certificate Authority list])
AC_ARG_WITH(ca-file,
[AC_HELP_STRING([--with-ca-file=@<:@path@:>@],
[path to system Certificate Authority list])])
if test "$with_ca_file" = "no"; then
AC_MSG_RESULT([disabled])
else
if test -z "$with_ca_file"; then
for f in /etc/pki/tls/certs/ca-bundle.crt \
/etc/ssl/certs/ca-certificates.crt; do
if test -f "$f"; then
with_ca_file="$f"
fi
done
if test -z "$with_ca_file"; then
AC_MSG_ERROR([could not find. Use --with-ca-file=path to set, or --without-ca-file to disable])
fi
fi
AC_MSG_RESULT($with_ca_file)
GTLS_SYSTEM_CA_FILE="$with_ca_file"
AC_DEFINE_UNQUOTED([GTLS_SYSTEM_CA_FILE], ["$GTLS_SYSTEM_CA_FILE"], [path to system Certificate Authority list])
fi
# -----------------------------------------------------------
# Connectivity integration
# -----------------------------------------------------------
......@@ -302,13 +300,8 @@ AC_ARG_ENABLE(webkit,
if test "x$enable_webkit" != "xno"; then
if test "x$have_gtk3" == "xno"; then
PKG_CHECK_MODULES(WEBKIT, [webkit-1.0 >= $WEBKIT_REQUIRED],
have_webkit="yes", have_webkit="no")
else
PKG_CHECK_MODULES(WEBKIT, [webkitgtk-3.0 >= $WEBKIT_REQUIRED],
have_webkit="yes", have_webkit="no")
fi
PKG_CHECK_MODULES(WEBKIT, [webkit-1.0 >= $WEBKIT_REQUIRED],
have_webkit="yes", have_webkit="no")
if test "x$have_webkit" = "xyes"; then
AC_DEFINE(HAVE_WEBKIT, 1, [Define if you have libwebkitgtk])
......@@ -370,17 +363,12 @@ AC_ARG_ENABLE(map,
if test "x$enable_map" != "xno"; then
if test "x$have_gtk3" == "xno"; then
PKG_CHECK_MODULES(LIBCHAMPLAIN,
[
champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED,
champlain-gtk-0.8 >= $LIBCHAMPLAIN_GTK_REQUIRED
clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
], have_libchamplain="yes", have_libchamplain="no")
else
# FIXME: check deps once clutter-gtk and champlain have been ported to GTK3
have_libchamplain="no"
fi
PKG_CHECK_MODULES(LIBCHAMPLAIN,
[
champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED,
champlain-gtk-0.8 >= $LIBCHAMPLAIN_GTK_REQUIRED
clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
], have_libchamplain="yes", have_libchamplain="no")
if test "x$have_libchamplain" = "xyes"; then
AC_DEFINE(HAVE_LIBCHAMPLAIN, 1, [Define if you have libchamplain])
......@@ -462,19 +450,12 @@ AC_ARG_ENABLE(nautilus-sendto,
enable_nautilus_sendto=auto)
if test "x$enable_nautilus_sendto" != "xno"; then
if test "x$have_gtk3" == "xno"; then
# Newer NST requires GTK+3 so we can't use it
PKG_CHECK_MODULES(NST,
[
nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED
nautilus-sendto < 2.90.0
], have_nst="yes", have_nst="no")
else
PKG_CHECK_MODULES(NST,
[
nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED_GTK3
], have_nst="yes", have_nst="no")
fi
# Newer NST requires GTK+3 so we can't use it
PKG_CHECK_MODULES(NST,
[
nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED
nautilus-sendto < 2.90.0
], have_nst="yes", have_nst="no")
else
have_nst=no
fi
......@@ -495,13 +476,8 @@ AC_ARG_ENABLE(control_center_embedding,
if test "x$enable_control_center_embedding" != "xno"; then
if test "x$have_gtk3" == "xno"; then
PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING, [libgnome-control-center < GNOME_CONTROL_CENTER_GTK3_REQUIRED],
have_control_center_embedding="yes", have_control_center_embedding="no")
else
PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING, [libgnome-control-center >= GNOME_CONTROL_CENTER_GTK3_REQUIRED],
have_control_center_embedding="yes", have_control_center_embedding="no")
fi
PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING, [libgnome-control-center < GNOME_CONTROL_CENTER_GTK3_REQUIRED],
have_control_center_embedding="yes", have_control_center_embedding="no")
if test "x$have_control_center_embedding" = "xyes"; then
AC_DEFINE(HAVE_CONTROL_CENTER_EMBEDDING, 1, [Define if you have the single-window control center])
......@@ -564,7 +540,7 @@ Configure summary:
Compiler Flags..............: ${CFLAGS} ${ERROR_CFLAGS}
Prefix......................: ${prefix}
Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS}
Use GTK+3...................: ${have_gtk3}
CA Cert Path................: ${GTLS_SYSTEM_CA_FILE}
Features:
Spell checking (enchant)....: ${have_enchant}
......
......@@ -46,3 +46,9 @@ slave-method=2
[rtph264pay]
config-interval=5
[rtppcmupay]
ptime-multiple=20000000
[rtppcmapay]
ptime-multiple=20000000
This diff is collapsed.
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy-docs master\n"
"POT-Creation-Date: 2010-09-25 16:27+0000\n"
"PO-Revision-Date: 2010-09-25 18:29+0200\n"
"PO-Revision-Date: 2010-10-20 12:18+0200\n"
"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
"Language-Team: Hungarian <gnome at fsf dot hu>\n"
"MIME-Version: 1.0\n"
......@@ -688,7 +688,7 @@ msgstr "Mi az a Közeli emberek?"
#: C/salut-protocol.page:37(p)
msgid "I'd like to see this played up a bit more."
msgstr "<komment>"
msgstr "I'd like to see this played up a bit more."
#: C/salut-protocol.page:40(p)
msgid ""
......@@ -815,7 +815,9 @@ msgstr "shaunm"
msgid ""
"Empathy no longer allows you to create an IRC account without a valid nick. "
"I've removed the guide link. Remove the text."
msgstr "<komment>"
msgstr ""
"Empathy no longer allows you to create an IRC account without a valid nick. "
"I've removed the guide link. Remove the text."
#: C/prob-conn-neterror.page:41(p)
msgid ""
......@@ -880,7 +882,7 @@ msgstr "„A név használatban”"
msgid ""
"An error message which says “<gui>Name in use</gui>” appears in the main "
"window."
msgstr "A főablakban a „<gui>A név használatban</gui>” üzenet jelenik meg."
msgstr "A főablakban az „<gui>A név használatban</gui>” üzenet jelenik meg."
#: C/prob-conn-name.page:32(title)
msgid "I get a message that says “Name in use”"
......@@ -1006,7 +1008,12 @@ msgid ""
"independent of the selection (like in yellow or something), we can use the "
"term \"highlight\". Otherwise we need to use the term \"select\". Watch that "
"bug."
msgstr "<komment>"
msgstr ""
"Highlighting text is quirky: <link href=\"http://bugzilla.gnome.org/show_bug."
"cgi?id=593733\">#593733</link>. If there's an actual highlighting going on, "
"independent of the selection (like in yellow or something), we can use the "
"term \"highlight\". Otherwise we need to use the term \"select\". Watch that "
"bug."
#: C/prev-conv.page:46(p)
msgid ""
......@@ -2725,7 +2732,11 @@ msgid ""
"need to look at the accessibility impact. I've <link href=\"http://mail."
"gnome.org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the "
"accessibility team</link> for input."
msgstr "<komment>"
msgstr ""
"I'd like to do tables like this using nothing for No and ✔ for Yes, but we "
"need to look at the accessibility impact. I've <link href=\"http://mail."
"gnome.org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the "
"accessibility team</link> for input."
#: C/audio-video.page:118(p)
msgid ""
......@@ -2733,7 +2744,11 @@ msgid ""
"video for MSN. It might be released in time for 2.28, but since it doesn't "
"follow the Gnome release schedule, I can't be sure. If it looks like it's "
"going to ship, let's mark it Yes."
msgstr "<komment>"
msgstr ""
"There's recent work on telepathy-butterfly and papyon to support audio and "
"video for MSN. It might be released in time for 2.28, but since it doesn't "
"follow the Gnome release schedule, I can't be sure. If it looks like it's "
"going to ship, let's mark it Yes."
#: C/audio-video.page:128(p)
msgid "Service"
......@@ -3379,5 +3394,5 @@ msgstr ""
#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
#: C/index.page:0(None)
msgid "translator-credits"
msgstr "Kelemen Gábor <kelemeng@gnome.hu>"
msgstr "Kelemen Gábor <kelemeng at gnome dot hu>"
This diff is collapsed.
......@@ -1909,6 +1909,7 @@ chat_log_filter (TplEntry *log,
for (; pending; pending = g_list_next (pending)) {
if (empathy_message_equal (message, pending->data)) {
g_object_unref (message);
return FALSE;
}
}
......
......@@ -363,7 +363,6 @@ empathy_contact_file_transfer_menu_item_new (EmpathyContact *contact)
return item;
}
/* FIXME we should check if the contact supports vnc stream tube */
GtkWidget *
empathy_contact_share_my_desktop_menu_item_new (EmpathyContact *contact)
{
......
......@@ -133,6 +133,8 @@ individual_menu_add_personas (GtkMenuShell *menu,
folks_persona_get_display_id (FOLKS_PERSONA (persona)), account);
contact_item = gtk_image_menu_item_new_with_label (label);
gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (contact_item),
TRUE);
contact_submenu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (contact_item), contact_submenu);
image = gtk_image_new_from_icon_name (
......
......@@ -326,6 +326,13 @@ individual_store_find_contact (EmpathyIndividualStore *self,
return l;
}
static void
free_iters (GList *iters)
{
g_list_foreach (iters, (GFunc) gtk_tree_iter_free, NULL);
g_list_free (iters);
}
static void
individual_store_remove_individual (EmpathyIndividualStore *self,
FolksIndividual *individual)
......@@ -362,8 +369,7 @@ individual_store_remove_individual (EmpathyIndividualStore *self,
}
}
g_list_foreach (iters, (GFunc) gtk_tree_iter_free, NULL);
g_list_free (iters);
free_iters (iters);
}
static void
......@@ -490,9 +496,7 @@ individual_store_contact_set_active (EmpathyIndividualStore *self,
}
}
g_list_foreach (iters, (GFunc) gtk_tree_iter_free, NULL);
g_list_free (iters);
free_iters (iters);
}
static void individual_store_contact_active_free (ShowActiveData *data);
......@@ -616,6 +620,8 @@ individual_avatar_pixbuf_received_cb (FolksIndividual *individual,
EMPATHY_INDIVIDUAL_STORE_COL_PIXBUF_AVATAR, pixbuf,
-1);
}
free_iters (iters);
}
/* Free things */
......@@ -629,6 +635,7 @@ individual_avatar_pixbuf_received_cb (FolksIndividual *individual,
data->cancellable);
}
tp_clear_object (&pixbuf);
g_object_unref (data->cancellable);
g_slice_free (LoadAvatarData, data);
}
......@@ -786,8 +793,7 @@ individual_store_contact_update (EmpathyIndividualStore *self,
* timeout removes the user from the contact list, really we
* should remove the first timeout.
*/
g_list_foreach (iters, (GFunc) gtk_tree_iter_free, NULL);
g_list_free (iters);
free_iters (iters);
}
static void
......@@ -1470,6 +1476,8 @@ individual_store_name_sort_func (GtkTreeModel *model,
tp_clear_object (&individual_a);
tp_clear_object (&individual_b);
g_free (name_a);
g_free (name_b);
return ret_val;
}
......
......@@ -2267,6 +2267,7 @@ empathy_individual_view_get_group_menu (EmpathyIndividualView *view)
if (!group || is_fake_group)
{
/* We can't alter fake groups */
g_free (group);
return NULL;
}
......
......@@ -1108,6 +1108,9 @@ log_window_get_messages_for_date (EmpathyLogWindow *window,
date,
log_window_got_messages_for_date_cb,
(gpointer) window);
g_free (chat_id);
g_object_unref (account);
}
static void
......
......@@ -207,7 +207,7 @@ empathy_notify_manager_notification_is_enabled (EmpathyNotifyManager *self)
if (presence != TP_CONNECTION_PRESENCE_TYPE_AVAILABLE &&
presence != TP_CONNECTION_PRESENCE_TYPE_UNSET)
{
if (!g_settings_get_boolean (gsettings,
if (g_settings_get_boolean (gsettings,
EMPATHY_PREFS_NOTIFICATIONS_DISABLED_AWAY))
goto finally;
}
......
......@@ -39,7 +39,7 @@ typedef struct {
struct _SmileyManagerTree {
gunichar c;
GdkPixbuf *pixbuf;
const gchar *path;
gchar *path;
GSList *childrens;
};
......@@ -78,6 +78,7 @@ smiley_manager_tree_free (SmileyManagerTree *tree)
g_object_unref (tree->pixbuf);
}
g_slist_free (tree->childrens);
g_free (tree->path);
g_slice_free (SmileyManagerTree, tree);
}
......@@ -209,13 +210,13 @@ smiley_manager_tree_insert (SmileyManagerTree *tree,
}
child->pixbuf = g_object_ref (pixbuf);
child->path = path;
child->path = g_strdup (path);
}
static void
smiley_manager_add_valist (EmpathySmileyManager *manager,
GdkPixbuf *pixbuf,
gchar *path,
const gchar *path,
const gchar *first_str,
va_list var_args)
{
......@@ -227,7 +228,6 @@ smiley_manager_add_valist (EmpathySmileyManager *manager,
smiley_manager_tree_insert (priv->tree, pixbuf, str, path);
}
/* We give the ownership of path to the smiley */
g_object_set_data_full (G_OBJECT (pixbuf), "smiley_str",
g_strdup (first_str), g_free);
smiley = smiley_new (pixbuf, first_str);
......@@ -256,6 +256,7 @@ empathy_smiley_manager_add (EmpathySmileyManager *manager,
smiley_manager_add_valist (manager, pixbuf, path, first_str, var_args);
va_end (var_args);
g_object_unref (pixbuf);
g_free (path);
}
}
......
......@@ -603,7 +603,7 @@ avatar_file_load_contents_cb (GObject *object,
}
g_simple_async_result_set_op_res_gpointer (closure->result,
avatar_pixbuf_from_loader (loader), NULL);
avatar_pixbuf_from_loader (loader), g_object_unref);
out:
g_simple_async_result_complete (closure->result);
......@@ -653,6 +653,7 @@ out:
g_object_unref (result);
}
/* Return a ref on the GdkPixbuf */
GdkPixbuf *
empathy_pixbuf_avatar_from_individual_scaled_finish (
FolksIndividual *individual,
......@@ -661,6 +662,7 @@ empathy_pixbuf_avatar_from_individual_scaled_finish (
{
GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
gboolean result_valid;
GdkPixbuf *pixbuf;
g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (simple), NULL);
......@@ -673,7 +675,8 @@ empathy_pixbuf_avatar_from_individual_scaled_finish (
empathy_pixbuf_avatar_from_individual_scaled_async);
g_return_val_if_fail (result_valid, NULL);
return g_simple_async_result_get_op_res_gpointer (simple);
pixbuf = g_simple_async_result_get_op_res_gpointer (simple);
return pixbuf != NULL ? g_object_ref (pixbuf) : NULL;
}
GdkPixbuf *
......
......@@ -267,6 +267,7 @@ empathy_message_from_tpl_log_entry (TplEntry *logentry)
TplEntity *receiver = NULL;
TplEntity *sender = NULL;
gchar *body= NULL;
EmpathyContact *contact;
g_return_val_if_fail (TPL_IS_ENTRY (logentry), NULL);
......@@ -303,12 +304,17 @@ empathy_message_from_tpl_log_entry (TplEntry *logentry)
sender = tpl_entry_get_sender (logentry);
retval = empathy_message_new (body);
if (receiver != NULL)
empathy_message_set_receiver (retval,
empathy_contact_from_tpl_contact (account, receiver));
if (sender != NULL)
empathy_message_set_sender (retval,
empathy_contact_from_tpl_contact (account, sender));
if (receiver != NULL) {
contact = empathy_contact_from_tpl_contact (account, receiver);
empathy_message_set_receiver (retval, contact);
g_object_unref (contact);
}
if (sender != NULL) {
contact = empathy_contact_from_tpl_contact (account, sender);
empathy_message_set_sender (retval, contact);
g_object_unref (contact);
}
empathy_message_set_timestamp (retval,
tpl_entry_get_timestamp (logentry));
......
......@@ -44,7 +44,9 @@ enum {
};
static const gchar* system_ca_paths[] = {
"/etc/ssl/certs/ca-certificates.crt",
#ifdef GTLS_SYSTEM_CA_FILE
GTLS_SYSTEM_CA_FILE,
#endif
NULL,
};
......@@ -260,10 +262,13 @@ real_start_verification (EmpathyTLSVerifier *self)
/* if the last certificate is self-signed, and we have a list of
* trusted CAs, ignore it, as we want to check the chain against our
* trusted CAs list first.
* if we have only one certificate in the chain, don't ignore it though,
* as it's the CA certificate itself.
*/
last_cert = g_ptr_array_index (priv->cert_chain, num_certs - 1);
if (gnutls_x509_crt_check_issuer (last_cert, last_cert) > 0)
if (gnutls_x509_crt_check_issuer (last_cert, last_cert) > 0 &&
num_certs > 1)
num_certs--;
}
......
......@@ -49,6 +49,7 @@ mk
ml
mr
ms
my
nb
ne
nl
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -8,17 +8,17 @@
#
msgid ""
msgstr ""
"Project-Id-Version: empathy MASTER\n"
"Project-Id-Version: empathy 2.32\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&component=general\n"
"POT-Creation-Date: 2010-09-22 00:00+0000\n"
"PO-Revision-Date: 2010-09-22 11:05+0300\n"
"POT-Creation-Date: 2010-11-13 22:40+0000\n"
"PO-Revision-Date: 2010-10-17 15:05+0300\n"
"Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n"
"Language-Team: Estonian <et@li.org>\n"
"Language: et\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: et\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-Language: Estonian\n"
"X-Poedit-Country: ESTONIA\n"
......@@ -742,8 +742,8 @@ msgid ""
msgstr ""
"See on sinu kasutajanimi, mitte tavaline Facebooki sisselogimise nimi.\n"
"Kui sinu leht on facebook.com/<b>hüüdnimi</b>, sisesta <b>hüüdnimi</b>.\n"
"Kui sul veel ei ole Facebooki kasutajanime, saad selle luua <a href=\"http://"
"www.facebook.com/username/\">siin lehel</a>."
"Kui sul veel ei ole Facebooki kasutajanime, saad selle luua <a "
"href=\"http://www.facebook.com/username/\">siin</a>."
msgid "Use old SS_L"
msgstr "Kasutatakse _vana SSL-i"
......@@ -2825,6 +2825,3 @@ msgstr "Empathy kontod"
msgid "Empathy Debugger"
msgstr "Empathy siluja"
#~ msgid "Use _Yahoo! Japan"
#~ msgstr "Jaapani _Yahoo! kasutamine"
This diff is collapsed.
......@@ -3480,11 +3480,11 @@ msgstr "Afficher les p_rotocoles"
#: ../src/empathy-main-window.ui.h:10
msgid "Sort by _Name"
msgstr "Trié par _nom"
msgstr "Trier par _nom"
#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Status"
msgstr "Trié par é_tat"
msgstr "Trier par é_tat"
#: ../src/empathy-main-window.ui.h:12
msgid "_Accounts"
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -9,7 +9,7 @@ import time
from string import Template
from optparse import OptionParser
last_tag_pattern = 'EMPATHY_2_31*'
last_tag_pattern = 'EMPATHY_2_32*'
upload_server = 'master.gnome.org'
template = '''\
$name $version is now available for download from:
......@@ -268,6 +268,7 @@ class Project:
def send_email(self):
notes = self.get_release_notes()
print notes
cmd = 'xdg-email ' \
' --cc telepathy@lists.freedesktop.org' \
' --subject "ANNOUNCE: Empathy %s"' \
......
......@@ -385,6 +385,9 @@ main_window_row_deleted_cb (GtkTreeModel *model,
gtk_label_set_markup (GTK_LABEL (priv->no_entry_label), tmp);
g_free (tmp);
gtk_label_set_ellipsize (GTK_LABEL (priv->no_entry_label),
PANGO_ELLIPSIZE_END);
gtk_notebook_set_current_page (
GTK_NOTEBOOK (priv->notebook), PAGE_NO_MATCH);
}
......