r17875 - in /desktop/experimental/ekiga/debian: changelog patches/migrate_2.0_settings.patch patches/series
dedu-guest at users.alioth.debian.org
dedu-guest at users.alioth.debian.org
Tue Dec 9 10:18:56 UTC 2008
Author: dedu-guest
Date: Tue Dec 9 10:18:56 2008
New Revision: 17875
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17875
Log:
Apply patch from upstream to properly migrate from 2.0 settings,
thanks Martin Pitt.
Added:
desktop/experimental/ekiga/debian/patches/migrate_2.0_settings.patch
Modified:
desktop/experimental/ekiga/debian/changelog
desktop/experimental/ekiga/debian/patches/series
Modified: desktop/experimental/ekiga/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/changelog?rev=17875&op=diff
==============================================================================
--- desktop/experimental/ekiga/debian/changelog (original)
+++ desktop/experimental/ekiga/debian/changelog Tue Dec 9 10:18:56 2008
@@ -4,6 +4,8 @@
* Really fix #505536 (Symlink identical GNOME help files, to reduce size)
by build-depending on fdupes, thanks Martin Pitt.
* Cleanup rules further.
+ * Add migrate_2.0_settings.patch: Properly migrate settings from
+ 2.0. Taken from upstream SVN, thanks to Damien Sandras!
[ Emilio Pozuelo Monfort ]
* Section of ekiga-dbg is gnome.
Added: desktop/experimental/ekiga/debian/patches/migrate_2.0_settings.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/patches/migrate_2.0_settings.patch?rev=17875&op=file
==============================================================================
--- desktop/experimental/ekiga/debian/patches/migrate_2.0_settings.patch (added)
+++ desktop/experimental/ekiga/debian/patches/migrate_2.0_settings.patch Tue Dec 9 10:18:56 2008
@@ -1,0 +1,137 @@
+# Description: Properly migrate settings from 2.0.
+# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=561180
+# Upstream: http://svn.gnome.org/viewvc/ekiga?view=revision&revision=7440
+Index: ekiga-3.0.1/src/gui/assistant.cpp
+===================================================================
+--- ekiga-3.0.1.orig/src/gui/assistant.cpp 2008-12-07 10:29:19.000000000 -0800
++++ ekiga-3.0.1/src/gui/assistant.cpp 2008-12-07 10:29:25.000000000 -0800
+@@ -1529,10 +1529,6 @@
+
+ GtkWidget *main_window;
+
+- const int schema_version = MAJOR_VERSION * 1000
+- + MINOR_VERSION * 10
+- + BUILD_NUMBER;
+-
+ apply_personal_data_page (assistant);
+ apply_ekiga_net_page (assistant);
+ apply_ekiga_out_page (assistant);
+@@ -1546,9 +1542,6 @@
+ gtk_widget_hide (GTK_WIDGET (assistant));
+ gtk_assistant_set_current_page (gtkassistant, 0);
+ gtk_widget_show (main_window);
+-
+- /* Update the version number */
+- gm_conf_set_int (GENERAL_KEY "version", schema_version);
+ }
+
+
+Index: ekiga-3.0.1/src/gui/conf.cpp
+===================================================================
+--- ekiga-3.0.1.orig/src/gui/conf.cpp 2008-12-07 10:29:19.000000000 -0800
++++ ekiga-3.0.1/src/gui/conf.cpp 2008-12-07 10:29:25.000000000 -0800
+@@ -322,4 +322,80 @@
+ gm_conf_set_string (NAT_KEY "public_ip_detector",
+ "http://ekiga.net/ip/");
+ g_free (conf_url);
++
++ /* New full name key */
++ conf_url = gm_conf_get_string (PERSONAL_DATA_KEY "full_name");
++ if (!conf_url || (conf_url && !strcmp (conf_url, ""))) {
++
++ gchar *fullname = NULL;
++ gchar *firstname = gm_conf_get_string (PERSONAL_DATA_KEY "firstname");
++ gchar *lastname = gm_conf_get_string (PERSONAL_DATA_KEY "lastname");
++
++ if (firstname && lastname && strcmp (firstname, "") && strcmp (lastname, "")) {
++ fullname = g_strdup_printf ("%s %s", firstname, lastname);
++ gm_conf_set_string (PERSONAL_DATA_KEY "firstname", "");
++ gm_conf_set_string (PERSONAL_DATA_KEY "lastname", "");
++ gm_conf_set_string (PERSONAL_DATA_KEY "full_name", fullname);
++ g_free (fullname);
++ }
++ g_free (firstname);
++ g_free (lastname);
++ }
++ g_free (conf_url);
++
++ /* diamondcard is now set at sip.diamondcard.us */
++ GSList *accounts = gm_conf_get_string_list ("/apps/ekiga/protocols/accounts_list");
++ GSList *accounts_iter = accounts;
++ while (accounts_iter) {
++
++ PString acct = (gchar *) accounts_iter->data;
++ acct.Replace ("eugw.ast.diamondcard.us", "sip.diamondcard.us", TRUE);
++ g_free (accounts_iter->data);
++ accounts_iter->data = g_strdup ((const char *) acct);
++ accounts_iter = g_slist_next (accounts_iter);
++ }
++ gm_conf_set_string_list ("/apps/ekiga/protocols/accounts_list", accounts);
++ g_slist_foreach (accounts, (GFunc) g_free, NULL);
++ g_slist_free (accounts);
++
++ /* Audio devices */
++ gchar *plugin = NULL;
++ gchar *device = NULL;
++ gchar *new_device = NULL;
++ plugin = gm_conf_get_string (AUDIO_DEVICES_KEY "plugin");
++ if (plugin && strcmp (plugin, "")) {
++ device = gm_conf_get_string (AUDIO_DEVICES_KEY "input_device");
++ new_device = g_strdup_printf ("%s (PTLIB/%s)", device, plugin);
++ gm_conf_set_string (AUDIO_DEVICES_KEY "plugin", "");
++ gm_conf_set_string (AUDIO_DEVICES_KEY "input_device", new_device);
++ g_free (device);
++ g_free (new_device);
++
++ device = gm_conf_get_string (AUDIO_DEVICES_KEY "output_device");
++ new_device = g_strdup_printf ("%s (PTLIB/%s)", device, plugin);
++ gm_conf_set_string (AUDIO_DEVICES_KEY "plugin", "");
++ gm_conf_set_string (AUDIO_DEVICES_KEY "output_device", new_device);
++ g_free (device);
++ g_free (new_device);
++
++ device = gm_conf_get_string (SOUND_EVENTS_KEY "output_device");
++ new_device = g_strdup_printf ("%s (PTLIB/%s)", device, plugin);
++ gm_conf_set_string (SOUND_EVENTS_KEY "plugin", "");
++ gm_conf_set_string (SOUND_EVENTS_KEY "output_device", new_device);
++ g_free (device);
++ g_free (new_device);
++ }
++ g_free (plugin);
++
++ /* Video devices */
++ plugin = gm_conf_get_string (VIDEO_DEVICES_KEY "plugin");
++ if (plugin && strcmp (plugin, "")) {
++ device = gm_conf_get_string (VIDEO_DEVICES_KEY "input_device");
++ new_device = g_strdup_printf ("%s (PTLIB/%s)", device, plugin);
++ gm_conf_set_string (VIDEO_DEVICES_KEY "plugin", "");
++ gm_conf_set_string (VIDEO_DEVICES_KEY "input_device", new_device);
++ g_free (device);
++ g_free (new_device);
++ }
++ g_free (plugin);
+ }
+Index: ekiga-3.0.1/src/gui/main.cpp
+===================================================================
+--- ekiga-3.0.1.orig/src/gui/main.cpp 2008-12-07 10:29:19.000000000 -0800
++++ ekiga-3.0.1/src/gui/main.cpp 2008-12-07 10:29:25.000000000 -0800
+@@ -4748,8 +4748,17 @@
+ < 1000 * MAJOR_VERSION + 10 * MINOR_VERSION + BUILD_NUMBER) {
+
+ gnomemeeting_conf_upgrade ();
+- assistant_window = GnomeMeeting::Process ()->GetAssistantWindow ();
+- gtk_widget_show_all (assistant_window);
++ // Only show the assistant window if version older than 2.00
++ if (gm_conf_get_int (GENERAL_KEY "version") < 2000) {
++ assistant_window = GnomeMeeting::Process ()->GetAssistantWindow ();
++ gtk_widget_show_all (assistant_window);
++ }
++ const int schema_version = MAJOR_VERSION * 1000
++ + MINOR_VERSION * 10
++ + BUILD_NUMBER;
++
++ /* Update the version number */
++ gm_conf_set_int (GENERAL_KEY "version", schema_version);
+ }
+ else {
+
Modified: desktop/experimental/ekiga/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/patches/series?rev=17875&op=diff
==============================================================================
--- desktop/experimental/ekiga/debian/patches/series (original)
+++ desktop/experimental/ekiga/debian/patches/series Tue Dec 9 10:18:56 2008
@@ -1,1 +1,2 @@
+migrate_2.0_settings.patch
00_news.patch
More information about the pkg-gnome-commits
mailing list