Hello, Please somebody with access to the CVS commit this. It adds 3 strings, so it has to be done ASAP. * gnomemeeting.schemas.in.in: Added 2 keys to remember position and size for the druid window. * druid.cpp, menu.cpp: Fixed bug where the druid was not displayed anymore. Remember position and size for the druid window. * config.cpp: Rename the groups in translated group names when upgrading from 0.98. * pref_window.cpp: Fixed typo. * ldap_window.h, ldap_window.cpp: Made function to rename a contact section public. Please write the ChangeLog entry. It is urgent !! Thanks, Damien
Attachment:
GNOMEMEE.SCH
Description: Binary data
178c178
< gtk_widget_hide (gw->druid_window);
---
> gnomemeeting_window_hide (gw->druid_window);
316c316
< gtk_widget_hide_all (GTK_WIDGET (gw->druid_window));
---
> gnomemeeting_window_hide (GTK_WIDGET (gw->druid_window));
1245a1246,1248
> g_object_set_data_full (G_OBJECT (window), "window_name",
> g_strdup ("druid_window"), g_free);
>
1910a1911,1914
>
> rename_contact_section ("Friends", _("Friends"), TRUE);
> rename_contact_section ("Work", _("Work"), TRUE);
> rename_contact_section ("Family", _("Family"), TRUE);
1030c1030
< unanswered incoming calls after X seconds */
---
> unanswered incoming calls after X s (seconds) */
1653,1654c1653,1654
< /* Translators: the full sentence is Maximum video bandwidth of X KB/s */
< gnome_prefs_spin_new (subsection, _("Maximum video _bandwidth of"), VIDEO_CODECS_KEY "maximum_video_bandwidth", _("The maximum video bandwidth in kbytes/s. The video quality and the number of transmitted frames per second will be dynamically adjusted above their minimum during calls to try to minimize the bandwidth to the given value."), 2.0, 100.0, 1.0, 0, _("KB/s"), true);
---
> /* Translators: the full sentence is Maximum video bandwidth of X kB/s */
> gnome_prefs_spin_new (subsection, _("Maximum video _bandwidth of"), VIDEO_CODECS_KEY "maximum_video_bandwidth", _("The maximum video bandwidth in kbytes/s. The video quality and the number of transmitted frames per second will be dynamically adjusted above their minimum during calls to try to minimize the bandwidth to the given value."), 2.0, 100.0, 1.0, 0, _("kB/s"), true);
189a190,200 > > > /* DESCRIPTION : / > * BEHAVIOR : Rename the contact section (group or server) given as > * parameter under its non-escaped form into the other > * parameter. > * PRE : Valid old contact section name, new contact section name. > */ > void rename_contact_section (const char *, > const char *, > gboolean);
340c340 < GTK_SIGNAL_FUNC (gtk_widget_show_all), --- > GTK_SIGNAL_FUNC (show_window_cb),
178,181d177
< static void rename_contact_section (const char *,
< const char *,
< gboolean);
<
2315,2421d2310
<
< /* DESCRIPTION : /
< * BEHAVIOR : Rename the contact section (group or server) given as
< * parameter under its non-escaped form into the other
< * parameter.
< * PRE : /
< */
< static void
< rename_contact_section (const char *contact_section_old,
< const char *contact_section_new,
< gboolean is_group)
< {
< GSList *contacts_sections = NULL;
< GSList *contacts_sections_iter = NULL;
< GSList *old_list = NULL;
<
< gchar *old_name = NULL;
< gchar *new_name = NULL;
< gchar *new_name_down = NULL;
< gchar *old_gconf_key = NULL;
< gchar *new_gconf_key = NULL;
< gchar *gconf_key = NULL;
<
< int pos = 0;
<
< GConfClient *client = NULL;
<
< if (!contact_section_old || !contact_section_new)
< return;
<
< client = gconf_client_get_default ();
<
< for (int i = 0 ; i < 2 ; i++) {
<
< if (i == 1)
< gconf_key = g_strdup (CONTACTS_KEY "ldap_servers_list");
< else
< gconf_key = g_strdup (CONTACTS_KEY "groups_list");
<
< contacts_sections =
< gconf_client_get_list (client, gconf_key, GCONF_VALUE_STRING, NULL);
< contacts_sections_iter = contacts_sections;
<
< old_name = escape_contact_section (contact_section_old);
< old_gconf_key = g_strdup_printf ("%s%s", CONTACTS_GROUPS_KEY, old_name);
<
< new_name = escape_contact_section (contact_section_new, FALSE);
< new_name_down = g_utf8_strdown (new_name, -1);
< new_gconf_key = g_strdup_printf ("%s%s", CONTACTS_GROUPS_KEY,
< new_name_down);
<
<
< while (contacts_sections_iter && contacts_sections_iter->data) {
<
< if ((!strcasecmp ((char *) contacts_sections_iter->data, old_name)
< || !strcasecmp ((char *) contacts_sections_iter->data,
< contact_section_old))
< && (is_group == (i == 0))) {
<
< contacts_sections =
< g_slist_remove_link (contacts_sections, contacts_sections_iter);
< g_slist_free_1 (contacts_sections_iter);
<
< contacts_sections =
< g_slist_insert (contacts_sections, g_strdup (new_name), pos);
<
< /* If it was a group, copy the old group content to the new one
< and unset the old key */
< if (i == 0) {
<
< old_list =
< gconf_client_get_list (client, old_gconf_key,
< GCONF_VALUE_STRING, NULL);
<
< gconf_client_set_list (client, new_gconf_key,
< GCONF_VALUE_STRING, old_list, NULL);
<
< gconf_client_remove_dir (client, "/apps/gnomemeeting", 0);
< gconf_client_unset (client, old_gconf_key, NULL);
< gconf_client_add_dir (client, "/apps/gnomemeeting",
< GCONF_CLIENT_PRELOAD_RECURSIVE, 0);
<
< g_slist_free (old_list);
< }
<
< contacts_sections_iter = contacts_sections;
< }
<
< contacts_sections_iter = g_slist_next (contacts_sections_iter);
< pos++;
< }
<
< gconf_client_set_list (client, gconf_key, GCONF_VALUE_STRING,
< contacts_sections, NULL);
<
< g_slist_free (contacts_sections);
< g_slist_free (contacts_sections_iter);
<
< g_free (new_gconf_key);
< g_free (old_gconf_key);
< g_free (new_name);
< g_free (new_name_down);
< g_free (old_name);
< g_free (gconf_key);
< }
< }
<
2700c2589,2599
<
---
> /* Hack to make sure that they are translated in the addressbook
> * now that unfortunately all people are using the english version
> */
> gchar *a = NULL;
> a = g_strdup (_("Friends"));
> g_free (a);
> a = g_strdup (_("Family"));
> g_free (a);
> a = g_strdup (_("Work"));
> g_free (a);
>
3839a3739,3839
> }
>
>
> void
> rename_contact_section (const char *contact_section_old,
> const char *contact_section_new,
> gboolean is_group)
> {
> GSList *contacts_sections = NULL;
> GSList *contacts_sections_iter = NULL;
> GSList *old_list = NULL;
>
> gchar *old_name = NULL;
> gchar *new_name = NULL;
> gchar *new_name_down = NULL;
> gchar *old_gconf_key = NULL;
> gchar *new_gconf_key = NULL;
> gchar *gconf_key = NULL;
>
> int pos = 0;
>
> GConfClient *client = NULL;
>
> if (!contact_section_old || !contact_section_new)
> return;
>
> client = gconf_client_get_default ();
>
> for (int i = 0 ; i < 2 ; i++) {
>
> if (i == 1)
> gconf_key = g_strdup (CONTACTS_KEY "ldap_servers_list");
> else
> gconf_key = g_strdup (CONTACTS_KEY "groups_list");
>
> contacts_sections =
> gconf_client_get_list (client, gconf_key, GCONF_VALUE_STRING, NULL);
> contacts_sections_iter = contacts_sections;
>
> old_name = escape_contact_section (contact_section_old);
> old_gconf_key = g_strdup_printf ("%s%s", CONTACTS_GROUPS_KEY, old_name);
>
> new_name = escape_contact_section (contact_section_new, FALSE);
> new_name_down = g_utf8_strdown (new_name, -1);
> new_gconf_key = g_strdup_printf ("%s%s", CONTACTS_GROUPS_KEY,
> new_name_down);
>
>
> while (contacts_sections_iter && contacts_sections_iter->data) {
>
> if ((!strcasecmp ((char *) contacts_sections_iter->data, old_name)
> || !strcasecmp ((char *) contacts_sections_iter->data,
> contact_section_old))
> && (is_group == (i == 0))) {
>
> contacts_sections =
> g_slist_remove_link (contacts_sections, contacts_sections_iter);
> g_slist_free_1 (contacts_sections_iter);
>
> contacts_sections =
> g_slist_insert (contacts_sections, g_strdup (new_name), pos);
>
> /* If it was a group, copy the old group content to the new one
> and unset the old key */
> if (i == 0) {
>
> old_list =
> gconf_client_get_list (client, old_gconf_key,
> GCONF_VALUE_STRING, NULL);
>
> gconf_client_set_list (client, new_gconf_key,
> GCONF_VALUE_STRING, old_list, NULL);
>
> gconf_client_remove_dir (client, "/apps/gnomemeeting", 0);
> gconf_client_unset (client, old_gconf_key, NULL);
> gconf_client_add_dir (client, "/apps/gnomemeeting",
> GCONF_CLIENT_PRELOAD_RECURSIVE, 0);
>
> g_slist_free (old_list);
> }
>
> contacts_sections_iter = contacts_sections;
> }
>
> contacts_sections_iter = g_slist_next (contacts_sections_iter);
> pos++;
> }
>
> gconf_client_set_list (client, gconf_key, GCONF_VALUE_STRING,
> contacts_sections, NULL);
>
> g_slist_free (contacts_sections);
> g_slist_free (contacts_sections_iter);
>
> g_free (new_gconf_key);
> g_free (old_gconf_key);
> g_free (new_name);
> g_free (new_name_down);
> g_free (old_name);
> g_free (gconf_key);
> }