aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac3
-rw-r--r--libempathy-gtk/empathy-chat-text-view.c38
-rw-r--r--libempathy-gtk/empathy-search-bar.c16
-rw-r--r--libempathy-gtk/empathy-theme-adium.c30
-rw-r--r--libempathy/empathy-gsettings.h3
-rw-r--r--po/et.po90
-rw-r--r--src/cc-empathy-accounts-panel.c9
-rw-r--r--src/empathy-accounts-dialog.c2
-rw-r--r--src/empathy-accounts-dialog.ui1
-rw-r--r--src/empathy-chat-window.c10
10 files changed, 119 insertions, 83 deletions
diff --git a/configure.ac b/configure.ac
index d2f09df1b..0ae7f47db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,6 @@ AC_COPYRIGHT([
# Hardp deps
FOLKS_REQUIRED=0.3.2
-GCONF_REQUIRED=1.2.0
GLIB_REQUIRED=2.27.2
GNUTLS_REQUIRED=2.8.5
GTK_REQUIRED=2.91.3
@@ -147,13 +146,13 @@ PKG_CHECK_MODULES(EMPATHY,
farsight2-0.10
folks >= $FOLKS_REQUIRED
folks-telepathy >= $FOLKS_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
gio-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
gnome-keyring-1 >= $KEYRING_REQUIRED
gnutls >= $GNUTLS_REQUIRED
gmodule-export-2.0
gobject-2.0
+ gsettings-desktop-schemas
gstreamer-0.10
gstreamer-interfaces-0.10
libxml-2.0
diff --git a/libempathy-gtk/empathy-chat-text-view.c b/libempathy-gtk/empathy-chat-text-view.c
index 07ad45dbd..644bd0077 100644
--- a/libempathy-gtk/empathy-chat-text-view.c
+++ b/libempathy-gtk/empathy-chat-text-view.c
@@ -32,7 +32,6 @@
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
-#include <gconf/gconf-client.h>
#include <telepathy-glib/util.h>
@@ -69,7 +68,7 @@ typedef struct {
time_t last_timestamp;
gboolean allow_scrolling;
guint notify_system_fonts_id;
- GConfClient *gconf_client;
+ GSettings *gsettings;
EmpathySmileyManager *smiley_manager;
gboolean only_if_date;
} EmpathyChatTextViewPriv;
@@ -209,9 +208,8 @@ chat_text_view_system_font_update (EmpathyChatTextView *view)
PangoFontDescription *font_description = NULL;
gchar *font_name;
- font_name = gconf_client_get_string (priv->gconf_client,
- "/desktop/gnome/interface/document_font_name",
- NULL);
+ font_name = g_settings_get_string (priv->gsettings,
+ EMPATHY_PREFS_DESKTOP_INTERFACE_DOCUMENT_FONT_NAME);
if (font_name != NULL) {
font_description = pango_font_description_from_string (font_name);
@@ -228,14 +226,11 @@ chat_text_view_system_font_update (EmpathyChatTextView *view)
}
static void
-chat_text_view_notify_system_font_cb (GConfClient *conf,
- guint id,
- GConfEntry *entry,
- gpointer user_data)
+chat_text_view_notify_system_font_cb (GSettings *gsettings,
+ const gchar *key,
+ EmpathyChatTextView *self)
{
- EmpathyChatTextView *view = user_data;
-
- chat_text_view_system_font_update (view);
+ chat_text_view_system_font_update (self);
}
static void
@@ -565,9 +560,7 @@ chat_text_view_finalize (GObject *object)
DEBUG ("%p", object);
- gconf_client_notify_remove (priv->gconf_client,
- priv->notify_system_fonts_id);
- g_object_unref (priv->gconf_client);
+ g_object_unref (priv->gsettings);
if (priv->last_contact) {
g_object_unref (priv->last_contact);
@@ -642,16 +635,11 @@ empathy_chat_text_view_init (EmpathyChatTextView *view)
"cursor-visible", FALSE,
NULL);
- priv->gconf_client = gconf_client_get_default ();
- gconf_client_add_dir (priv->gconf_client,
- "/desktop/gnome/interface",
- GCONF_CLIENT_PRELOAD_ONELEVEL,
- NULL);
- priv->notify_system_fonts_id =
- gconf_client_notify_add (priv->gconf_client,
- "/desktop/gnome/interface/document_font_name",
- chat_text_view_notify_system_font_cb,
- view, NULL, NULL);
+ priv->gsettings = g_settings_new (EMPATHY_PREFS_DESKTOP_INTERFACE_SCHEMA);
+ g_signal_connect (priv->gsettings,
+ "changed::" EMPATHY_PREFS_DESKTOP_INTERFACE_DOCUMENT_FONT_NAME,
+ G_CALLBACK (chat_text_view_notify_system_font_cb),
+ view);
chat_text_view_system_font_update (view);
chat_text_view_create_tags (view);
diff --git a/libempathy-gtk/empathy-search-bar.c b/libempathy-gtk/empathy-search-bar.c
index 9a27795a2..51a79096a 100644
--- a/libempathy-gtk/empathy-search-bar.c
+++ b/libempathy-gtk/empathy-search-bar.c
@@ -58,6 +58,21 @@ empathy_search_bar_new (EmpathyChatView *view)
}
static void
+empathy_search_bar_get_preferred_height (GtkWidget *widget,
+ gint *minimun_height,
+ gint *natural_height)
+{
+ GtkBin *bin;
+ GtkWidget *child;
+
+ bin = GTK_BIN (widget);
+ child = gtk_bin_get_child (bin);
+
+ if (child && gtk_widget_get_visible (child))
+ gtk_widget_get_preferred_height (child, minimun_height, natural_height);
+}
+
+static void
empathy_search_bar_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
@@ -290,6 +305,7 @@ empathy_search_bar_class_init (EmpathySearchBarClass *class)
g_type_class_add_private (gobject_class, sizeof (EmpathySearchBarPriv));
/* Neither GtkBin nor GtkContainer seems to do this for us :( */
+ widget_class->get_preferred_height = empathy_search_bar_get_preferred_height;
widget_class->size_allocate = empathy_search_bar_size_allocate;
}
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index b9b6169ef..921956e74 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -28,7 +28,6 @@
#include <telepathy-glib/dbus.h>
#include <telepathy-glib/util.h>
-#include <gconf/gconf-client.h>
#include <pango/pango.h>
#include <gdk/gdk.h>
@@ -48,8 +47,6 @@
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyThemeAdium)
-/* GConf key containing current value of font */
-#define EMPATHY_GCONF_FONT_KEY_NAME "/desktop/gnome/interface/document_font_name"
#define BORING_DPI_DEFAULT 96
/* "Join" consecutive messages with timestamps within five minutes */
@@ -981,24 +978,21 @@ theme_adium_inspect_web_view_cb (WebKitWebInspector *inspector,
static PangoFontDescription *
theme_adium_get_default_font (void)
{
- GConfClient *gconf_client;
+ GSettings *gsettings;
PangoFontDescription *pango_fd;
- gchar *gconf_font_family;
+ gchar *font_family;
- gconf_client = gconf_client_get_default ();
- if (gconf_client == NULL) {
- return NULL;
- }
- gconf_font_family = gconf_client_get_string (gconf_client,
- EMPATHY_GCONF_FONT_KEY_NAME,
- NULL);
- if (gconf_font_family == NULL) {
- g_object_unref (gconf_client);
+ gsettings = g_settings_new (EMPATHY_PREFS_DESKTOP_INTERFACE_SCHEMA);
+
+ font_family = g_settings_get_string (gsettings,
+ EMPATHY_PREFS_DESKTOP_INTERFACE_DOCUMENT_FONT_NAME);
+
+ if (font_family == NULL)
return NULL;
- }
- pango_fd = pango_font_description_from_string (gconf_font_family);
- g_free (gconf_font_family);
- g_object_unref (gconf_client);
+
+ pango_fd = pango_font_description_from_string (font_family);
+ g_free (font_family);
+ g_object_unref (gsettings);
return pango_fd;
}
diff --git a/libempathy/empathy-gsettings.h b/libempathy/empathy-gsettings.h
index aba78c880..6c4f73a55 100644
--- a/libempathy/empathy-gsettings.h
+++ b/libempathy/empathy-gsettings.h
@@ -91,6 +91,9 @@ G_BEGIN_DECLS
#define EMPATHY_PREFS_LOGGER_SCHEMA "org.freedesktop.Telepathy.Logger"
#define EMPATHY_PREFS_LOGGER_ENABLED "enabled"
+#define EMPATHY_PREFS_DESKTOP_INTERFACE_SCHEMA "org.gnome.desktop.interface"
+#define EMPATHY_PREFS_DESKTOP_INTERFACE_DOCUMENT_FONT_NAME "document-font-name"
+
G_END_DECLS
#endif /* __EMPATHY_GSETTINGS_H__ */
diff --git a/po/et.po b/po/et.po
index 2632a6c29..a1c5468e7 100644
--- a/po/et.po
+++ b/po/et.po
@@ -11,14 +11,14 @@ msgstr ""
"Project-Id-Version: empathy MASTER\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&component=general\n"
-"POT-Creation-Date: 2010-10-16 10:46+0000\n"
-"PO-Revision-Date: 2010-10-17 15:05+0300\n"
-"Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n"
+"POT-Creation-Date: 2010-11-15 13:44+0000\n"
+"PO-Revision-Date: 2010-11-16 10:46+0200\n"
+"Last-Translator: Ivar Smolin <okul@linux.ee>\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"
@@ -349,8 +349,8 @@ msgstr "Sõnumi- ja VoIP kontode haldamine"
msgid "Messaging and VoIP Accounts"
msgstr "Sõnumi- ja VoIP kontod"
-msgid "The hash of the received file and the sent one do not match"
-msgstr "Vastuvõetud faili ja saadetud faili räsi ei kattu"
+msgid "File transfer completed, but the file was corrupted"
+msgstr "Fail on täielikult üle kantud, kuid faili sisu on rikutud"
msgid "File transfer not supported by remote contact"
msgstr "Vestluskaaslane ei saa faile vastu võtta"
@@ -559,6 +559,17 @@ msgstr "Port"
msgid "%s:"
msgstr "%s:"
+#, c-format
+msgid "The account %s is edited via My Web Accounts."
+msgstr "Kontot %s muudetakse Minu Veebikontode kaudu."
+
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr "Kontot %s pole võimalik Empathy abil muuta."
+
+msgid "Launch My Web Accounts"
+msgstr "Käivita Minu Veebikontod"
+
msgid "Username:"
msgstr "Kasutajanimi:"
@@ -979,6 +990,17 @@ msgstr "Teemat pole seatud"
msgid "(No Suggestions)"
msgstr "(Soovitusi pole)"
+#. translators: %s is the selected word
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "Lisa '%s' sõnastikku"
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "Lisa '%s' sõnastikku '%s'"
+
msgid "Insert Smiley"
msgstr "Tujunäo lisamine"
@@ -986,6 +1008,7 @@ msgstr "Tujunäo lisamine"
msgid "_Send"
msgstr "_Saada"
+#. Spelling suggestions
msgid "_Spelling Suggestions"
msgstr "_Õigekirja soovitused"
@@ -1527,11 +1550,11 @@ msgstr "Sisesta oma teade"
msgid "Edit Custom Messages"
msgstr "Teadete muutmine"
-msgid "Add _New Preset"
-msgstr "_Uue oleku lisamine"
+msgid "Save _New Status Message"
+msgstr "Salvesta _uus olekusõnum"
-msgid "Saved Presets"
-msgstr "Salvestatud olekud"
+msgid "Saved Status Messages"
+msgstr "Salvestatud olekuteated"
msgid "Classic"
msgstr "Klassikaline"
@@ -1714,6 +1737,15 @@ msgstr "Veateade puudub"
msgid "Instant Message (Empathy)"
msgstr "Välksõnum (Empathy)"
+msgid "Don't connect on startup"
+msgstr "Käivitumisel ei ühenduta"
+
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "Käivitumisel ei näidata kontaktide nimekirja ega teisi dialoogiaknaid"
+
+msgid "- Empathy IM Client"
+msgstr "- Empathy interneti sõnumivahetus"
+
msgid "Error contacting the Account Manager"
msgstr "Viga kontohalduriga ühendumisel"
@@ -1728,15 +1760,6 @@ msgstr ""
"\n"
"%s"
-msgid "Don't connect on startup"
-msgstr "Käivitumisel ei ühenduta"
-
-msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "Käivitumisel ei näidata kontaktide nimekirja ega teisi dialoogiaknaid"
-
-msgid "- Empathy IM Client"
-msgstr "- Empathy interneti sõnumivahetus"
-
msgid ""
"Empathy is free software; you can redistribute it and/or modify it under the "
"terms of the GNU General Public License as published by the Free Software "
@@ -2342,8 +2365,8 @@ msgid "Incoming file transfer from %s"
msgstr "Failiülekanne kasutajalt %s"
#, c-format
-msgid "Subscription requested by %s"
-msgstr "Tellimus, mida küsis %s"
+msgid "%s would like permission to see when you are available"
+msgstr "%s palub luba sinu saadavaloleku nägemiseks"
#, c-format
msgid ""
@@ -2497,6 +2520,9 @@ msgstr "Kontaktid _kaardil"
msgid "Context"
msgstr "Kontekst"
+msgid "Find in Contact _List"
+msgstr "_Otsi kontaktide nimekirjast"
+
msgid "Join _Favorites"
msgstr "Ühine _lemmiktubadega"
@@ -2823,8 +2849,11 @@ msgstr ""
"Ei kuvata mingeid dialooge; sooritatakse ülesanne (nt. importimine) ja "
"väljutakse"
-msgid "Don't display any dialogs if there are any non-Salut accounts"
-msgstr "Kui on mõni mitte-salut konto, ei kuvata mingeid dialoogiaknaid"
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+"Kui pole ühtegi \"lähedalasuvate inimesete\" kontot, siis dialoogiaknaid ei "
+"kuvata."
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr "Alguses vali antud konto (nt. gabble/jabber/mingi_40näidis_2eorg0)"
@@ -2840,3 +2869,18 @@ msgstr "Empathy kontod"
msgid "Empathy Debugger"
msgstr "Empathy siluja"
+
+msgid "- Empathy Chat Client"
+msgstr "- Empathy sõnumivahetusklient"
+
+#~ msgid "The hash of the received file and the sent one do not match"
+#~ msgstr "Vastuvõetud faili ja saadetud faili räsi ei kattu"
+
+#~ msgid "Add _New Preset"
+#~ msgstr "_Uue oleku lisamine"
+
+#~ msgid "Saved Presets"
+#~ msgstr "Salvestatud olekud"
+
+#~ msgid "Subscription requested by %s"
+#~ msgstr "Tellimus, mida küsis %s"
diff --git a/src/cc-empathy-accounts-panel.c b/src/cc-empathy-accounts-panel.c
index d4dbf1e97..24be69121 100644
--- a/src/cc-empathy-accounts-panel.c
+++ b/src/cc-empathy-accounts-panel.c
@@ -29,7 +29,6 @@
#include <glib/gi18n-lib.h>
#include <telepathy-glib/telepathy-glib.h>
-#include <gconf/gconf-client.h>
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-connection-managers.h>
@@ -214,20 +213,12 @@ cc_empathy_accounts_panel_class_finalize (CcEmpathyAccountsPanelClass *klass)
static void
cc_empathy_accounts_panel_init (CcEmpathyAccountsPanel *panel)
{
- GConfClient *client;
TpAccountManager *account_manager;
panel->priv = CC_EMPATHY_ACCOUNTS_PANEL_GET_PRIVATE (panel);
empathy_gtk_init ();
- client = gconf_client_get_default ();
- gconf_client_add_dir (client, "/desktop/gnome/peripherals/empathy_accounts",
- GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
- gconf_client_add_dir (client, "/desktop/gnome/interface",
- GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
- g_object_unref (client);
-
/* unref'd in final endpoint callbacks */
account_manager = tp_account_manager_dup ();
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 9f2f97a41..8eda73bb4 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -2006,7 +2006,7 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
- gtk_container_add (GTK_CONTAINER (content_area), top_hbox);
+ gtk_box_pack_start (GTK_BOX (content_area), top_hbox, TRUE, TRUE, 0);
g_object_unref (gui);
diff --git a/src/empathy-accounts-dialog.ui b/src/empathy-accounts-dialog.ui
index 1980759ad..a1282fdf5 100644
--- a/src/empathy-accounts-dialog.ui
+++ b/src/empathy-accounts-dialog.ui
@@ -68,6 +68,7 @@
</child>
</object>
<packing>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 43c4fabf6..4aba2af2d 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -111,6 +111,8 @@ typedef struct {
/* Last user action time we acted upon to show a tab */
guint32 x_user_action_time;
+
+ GSettings *gsettings_chat;
} EmpathyChatWindowPriv;
static GList *chat_windows = NULL;
@@ -533,9 +535,7 @@ chat_window_icon_update (EmpathyChatWindowPriv *priv)
gtk_window_set_icon_name (GTK_WINDOW (priv->dialog),
EMPATHY_IMAGE_MESSAGE);
} else {
- GSettings *gsettings = g_settings_new (EMPATHY_PREFS_CHAT_SCHEMA);
-
- avatar_in_icon = g_settings_get_boolean (gsettings,
+ avatar_in_icon = g_settings_get_boolean (priv->gsettings_chat,
EMPATHY_PREFS_CHAT_AVATAR_IN_ICON);
if (n_chats == 1 && avatar_in_icon) {
@@ -549,8 +549,6 @@ chat_window_icon_update (EmpathyChatWindowPriv *priv)
} else {
gtk_window_set_icon_name (GTK_WINDOW (priv->dialog), NULL);
}
-
- g_object_unref (gsettings);
}
}
@@ -1875,6 +1873,7 @@ chat_window_finalize (GObject *object)
g_object_unref (priv->ui_manager);
g_object_unref (priv->chatroom_manager);
g_object_unref (priv->notify_mgr);
+ g_object_unref (priv->gsettings_chat);
if (priv->notification != NULL) {
notify_notification_close (priv->notification, NULL);
@@ -1985,6 +1984,7 @@ empathy_chat_window_init (EmpathyChatWindow *window)
g_object_ref (priv->ui_manager);
g_object_unref (gui);
+ priv->gsettings_chat = g_settings_new (EMPATHY_PREFS_CHAT_SCHEMA);
priv->chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL);
priv->notebook = gtk_notebook_new ();
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-02 08:38:33 +0800