diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-11-13 11:19:58 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-11-13 11:19:58 +0000 |
| commit | 3a2f727173d25004d7945f6bc32a603619508f1a (patch) | |
| tree | 73e6c5dddf4d11303817e10ec13825fdecaa84d0 /gnome-base/gnome-control-center | |
| parent | Stable for HPPA (bug #529100). (diff) | |
| download | historical-3a2f727173d25004d7945f6bc32a603619508f1a.tar.gz historical-3a2f727173d25004d7945f6bc32a603619508f1a.tar.bz2 historical-3a2f727173d25004d7945f6bc32a603619508f1a.zip | |
Drop package due bug #508854
Diffstat (limited to 'gnome-base/gnome-control-center')
9 files changed, 0 insertions, 2334 deletions
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index f0b103172cb2..c2015c79bab2 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -1,25 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX gnome-control-center-2.32.1-duplicated-background.patch 3053 SHA256 8223542f9db11769e8ab73f88f434598bb9f740e42993bcc7cb6035eaadc986d SHA512 753b142ba24075276117a475453a4f2f083720fb13398d250c3a18f9047b4a429bb7a178076111f0c5b846c4cdca62824ad380a2db3d2a561c51f14a6df83b93 WHIRLPOOL 36027ef7289a94f2a477f1d2ea5d338c3205611b7d1684d8b36f2a088c3c5e9d58b1fc3a388305b50f1452f8e833e67d564bf67ef2537b0b38c5abaa8b7167bd -AUX gnome-control-center-2.32.1-erase-background.patch 1899 SHA256 95bc536d5b08191222acd63af0d2f626ef6ec3a54f7823a471e0b329f40de3f8 SHA512 6f5c9aa935d74648b90fdaa8a3cf992e88f05d8f4bf02349760dd355313aa18ee3eefcadecdff585d67a6ba9b4df0851ddfc7bccf3c8e2780c749444707cd838 WHIRLPOOL 7d4b063a3e27a9c11a20c8e62fdc25a000c42fc4d22a1ec206b291571ccd9f9f11c4a3810700c043cbd5c758de70e713e55729c4de52aef8eee0451193cdd229 -AUX gnome-control-center-2.32.1-gmodule.patch 1403 SHA256 5ff83a6ed423900ce726aa9df25fc5c8d81863ad1bd30609d9af1ed916b55328 SHA512 0cc8bb97a8820e000e9a1043bed8c020c82c55b8f39974397edb6e22a3ef8ad502f175390984cf0fa709bf3d0cbed5a1e042c0e457b531968edee64c6fb13875 WHIRLPOOL 1776e3d91b80ef9c6d93e1c7cfff666a12738a139a9592f98a5073b8743c4229e02842c1dbac7bcf252bac8af99de8f9e6adb9e9f667266aa53e28a6fbfde615 -AUX gnome-control-center-2.32.1-mime-handler.patch 55290 SHA256 49c034e437493f1639e97b31e0a38b1921536abfe31d8b3c7917d0b8495994cd SHA512 990849500fd5317ec6fbf58e03db3754c5e9111757d28d83bd4f7655068efb25fbe793f9d5171f227070dfde7b688163eab8c011edacb5435b4a788e8349aee6 WHIRLPOOL 8683316623e0059cec6278b7f0b0a23ea46dff73ca4ad2bc9ffe14b139072bfb4ea2589a76b74ccfb14170cff9cd756f1772ae356cdaa6779aee930907553130 -AUX gnome-control-center-2.32.1-mime-handler2.patch 2229 SHA256 3a49a66bb08cbcd24cf750894d156ba85686128e83561df40f8cfe88075ca99d SHA512 ea81dc45ef7f2b5c14e9a094a9a8601c6631ad1df60a9316ea2f2fe8c922979bbb23e1a3a13adb3ca909eed1b489a7eb521b85cf7bd0dd7e09ce528c0a38d751 WHIRLPOOL 1b8450b5073ddb44b30964373024005c6fadd58f3246cdf37290e8350cc3d9ca54754c6ac1eca5fcedbd06e288495e8657102d8c8200e30e83c07702eb34531a -AUX gnome-control-center-2.32.1-mime-handler3.patch 11957 SHA256 8637fdb6039d43d085cf7cf2915b46e744522b7a3976d1b64035a6be22491538 SHA512 c4a59d44853ce81c067626d1a51f3566a3cf754e98584d1a836072d8ea6b8a89fb6542f92b2237a4675c1f5cc296c76d28e39fb3e441cb8d6cc7f42877304307 WHIRLPOOL 20e47d5aa6670bee3a3e1dee8cd176e9c3909de2d60614b8d058a3c09b929e32761abd345592dc92f6cab32e2fb677ed4d87dfc63fc9b231a902b5dc4b3ed822 AUX gnome-control-center-3.10.2-gentoo-paths.patch 4304 SHA256 63a8fd44d0585c141e3207b697266850215ee3e0254621c4aa15ae17469dd385 SHA512 5340686d2e0de699d495d30e6969f5c4fcc5ce735e43d659da326c9445821c6de142b8ab98c858cf7c33c6c2acbbc91aab8d145d32bc2a4a17caef99a09f8623 WHIRLPOOL ff8aac218544b8ea0caa2cd7210129ca5277275a8c7db3846e4ca8e8c5eed6d8ca1e0a9de415d52ab51bf624247bd248442cc18a79fb8ba0f0ec032cef81663d AUX gnome-control-center-3.12.1-optional-r1.patch 19513 SHA256 f28ff1f142031f3a02abb91d4cfae5037f02caec4d11899ac50de35d1631a2c5 SHA512 949c808a34c6df8e66efba945af9561391fab52c32d2b3928361cdffd50f030c8c61f811f7fb1e601127bb38bb788f6a751cf78cd6f3757b255fd89722c3d15b WHIRLPOOL 72b91611ada4ebabf118d9af73511da186f470054533867ea78cc3cade2a4d40240b668ccd94ebecb5ce8098f0d48de13cdcb6dde3842be2eba57ae8a5b742fe -AUX gnome-control-center-3.12.1-optional.patch 14081 SHA256 23abccc022b2e2fe5d99dd82b6e076651469859a15bc44b91bb7f28ad895f1ad SHA512 0969b16675056ba1d10bf77352d6dc5012239277fe02da640771b8400bf8afafbc456f3cce7b4eb52d230d460a3869151c917f88703b2c3cf58a6addfdca527a WHIRLPOOL c92c638e53a18e43a100bb383bc3df3e6b7e59d3d95cd89867d8b4e052571845d0a15bbc2ecea889246703fcb130a15887cbb7904f45ea73708636e108fdd654 -DIST gnome-control-center-2.32.1.tar.bz2 2280217 SHA256 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66 SHA512 dc84bd222d1a2db0c4d10c56739e1d9da18945c579ae184f69080aa4b6fa0f0b908c5beafe82a82b6277630d685bed98fe8418421db4275653afbe302d810872 WHIRLPOOL 9b0fe4ed2bb741496642a57e178ca43049d53c71d9a82d311dc5a3ab6dfaf28019a8fa1b41a218b2ede11b4d0ac735034604dd9d952cb215e12327e71d0e69f4 DIST gnome-control-center-3.12.1.tar.xz 6866544 SHA256 5297d448eff0ec58f6c0ad9fbd1b94bed0a850496df0ee65571c0622b49c1582 SHA512 35b765fc11182b0f7eec6bc31934f51ccbf01dde9f2e7deed6c84ca9811bd0a00783d75bd3fab7004fe41cc29740b6d6e0a7f3c6391a482eefcab0129d0278fe WHIRLPOOL 294a2f81a1b225814fd895dc7b579f0dec9c360983d3d683b4ff5bd47dd9ac91a84088485f872a7ef95e05f021469da9eaf5d987bd537a062f9a1525c03c4b47 -EBUILD gnome-control-center-2.32.1-r1.ebuild 2823 SHA256 2dfa1f6402c7ab7f4539183e15448a234cb6f80e38310c50f222536291d4d4c1 SHA512 562dcadbf348f7e0a25796fa03b5a32786549537fa2213c6ac279b942269a0e8c62a7a977da54c6939d82e87460ee77422032b337dd1959e26403312d82cf081 WHIRLPOOL 099ea3c37bba16bbc94308961365123ccdc80e8b0ec291e3d50a2607ea59fb6b2ce2deba45d1e66be0c3cb99f86b9c0ad55d087c20f90ae7fd93fe8983c8a722 EBUILD gnome-control-center-3.12.1-r1.ebuild 5021 SHA256 382d52bbc8294eaac4bc9d2daf878c0720007a18b3712ff5be12b5ad90316bfd SHA512 c601e47473fd60af2da56529ee1b883e055ee398a4d08a9cc028671e00e0ceb5316cb17a486385f1e242efb8bf5e5623f487ff42c8b9119d30cc50687d4f40b3 WHIRLPOOL fa6236ecd93946911b6e3ecdcc1c0a42ac919bf058afca79beb557142c5f6317f9fdd470de486770960a74adf9c2318676577a4c99ff86bd5676b7077f52d196 MISC ChangeLog 70220 SHA256 a84125849f9f20e1c99550c5f74454eb598d5f15f74c48967f9ba2b55739df41 SHA512 04ea2f59858b611896df126cdb09a1fda41237c08de6e6e99c964d8a1de321aa08281db4784ca7a59867677e004e3ffb7da81739ba91ab270ba5c1fa8581c6cb WHIRLPOOL 50647eb59d99d39a03246a7cd7b8985a51e4808eb80e1a2a84f461480784da5e7f659e99b107939bc1e1bc8a019c32a3a0c99bfe0080ab1405229796a668c619 MISC metadata.xml 498 SHA256 fb46c54dc3e3ce2c8297d67292cd0ecadbdadf8c22a50437f8a03fd5b6ec9dc2 SHA512 ae1ff3489b7d037af4d1a550538e0cadfa815f6afcaa76b73afb3fa7d87d888c1ae5b3642416e9eb0cf0c2ba4f70a5ed1f5a9ccbb1d63320fc444ac3c3aed2d3 WHIRLPOOL 94896b01f55c9a411cf85eda67cdebba03f2e32a723094f9f839e04c5096d09b63b4ac0895b7ddb70bc0ba3ef2ea4aeb6eba650e926fbaef155554a768fad970 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iEYEAREIAAYFAlQlzYkACgkQCaWpQKGI+9RLVgCfRICkKgfbb53wbSMpRLVP4pvj -llwAn1RbvrudMAy2iroNzJ1w4Tb0bdwA -=+mtL ------END PGP SIGNATURE----- diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-duplicated-background.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-duplicated-background.patch deleted file mode 100644 index 7b4250559ad4..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-duplicated-background.patch +++ /dev/null @@ -1,115 +0,0 @@ -Index: gnome-control-center-2.32.1/capplets/appearance/appearance-desktop.c -=================================================================== ---- gnome-control-center-2.32.1.orig/capplets/appearance/appearance-desktop.c -+++ gnome-control-center-2.32.1/capplets/appearance/appearance-desktop.c -@@ -48,6 +48,50 @@ static const GtkTargetEntry drag_types[] - - static void wp_update_preview (GtkFileChooser *chooser, AppearanceData *data); - -+static GnomeWPItem * -+lookup_with_symlink (AppearanceData *data, -+ const char *path, -+ char **real_path) -+{ -+ GnomeWPItem *item; -+ gchar *readlink; -+ -+ if (real_path) -+ *real_path = NULL; -+ -+ if (!path) -+ return NULL; -+ -+ item = g_hash_table_lookup (data->wp_hash, path); -+ if (item) -+ return item; -+ -+ /* if the current background is not in the hash of known backgrounds, -+ * see if it's a symlink and if the file it points to is in the hash */ -+ -+ readlink = g_strdup (path); -+ -+ while (readlink && -+ g_file_test (readlink, G_FILE_TEST_IS_SYMLINK) && -+ item == NULL) { -+ gchar *new; -+ -+ new = g_file_read_link (readlink, NULL); -+ g_free (readlink); -+ readlink = new; -+ -+ if (readlink) -+ item = g_hash_table_lookup (data->wp_hash, readlink); -+ } -+ -+ if (item != NULL && real_path) -+ *real_path = readlink; -+ else -+ g_free (readlink); -+ -+ return item; -+} -+ - static void - select_item (AppearanceData *data, - GnomeWPItem * item, -@@ -418,11 +462,16 @@ wp_uri_changed (const gchar *uri, - AppearanceData *data) - { - GnomeWPItem *item, *selected; -+ gchar *realuri; -+ -+ realuri = NULL; -+ item = lookup_with_symlink (data, uri, &realuri); -+ if (!realuri) -+ realuri = g_strdup (uri); - -- item = g_hash_table_lookup (data->wp_hash, uri); - selected = get_selected_item (data, NULL); - -- if (selected != NULL && strcmp (selected->filename, uri) != 0) -+ if (selected != NULL && strcmp (selected->filename, realuri) != 0) - { - if (item == NULL) - item = wp_add_image (data, uri); -@@ -430,6 +479,8 @@ wp_uri_changed (const gchar *uri, - if (item) - select_item (data, item, TRUE); - } -+ -+ g_free (realuri); - } - - static void -@@ -936,6 +987,7 @@ wp_load_stuffs (void *user_data) - AppearanceData *data; - gchar *imagepath, *uri, *style; - GnomeWPItem *item; -+ gchar *realpath; - - data = (AppearanceData *) user_data; - -@@ -971,7 +1023,12 @@ wp_load_stuffs (void *user_data) - - g_free (uri); - -- item = g_hash_table_lookup (data->wp_hash, imagepath); -+ realpath = NULL; -+ item = lookup_with_symlink (data, imagepath, &realpath); -+ if (realpath) { -+ g_free (imagepath); -+ imagepath = realpath; -+ } - - if (item != NULL) - { -@@ -986,7 +1043,9 @@ wp_load_stuffs (void *user_data) - wp_props_load_wallpaper (item->filename, item, data); - } - -+ data->wp_update_gconf = FALSE; - select_item (data, item, FALSE); -+ data->wp_update_gconf = TRUE; - } - } - else if (strcmp (style, "none") != 0) diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-erase-background.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-erase-background.patch deleted file mode 100644 index 00be2f2eb0fc..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-erase-background.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -rupN gnome-control-center-2.32.0.old/capplets/appearance/appearance-desktop.c gnome-control-center-2.32.0.new/capplets/appearance/appearance-desktop.c ---- a/capplets/appearance/appearance-desktop.c 2010-09-21 08:54:55.000000000 -0400 -+++ b/capplets/appearance/appearance-desktop.c 2010-11-05 20:51:53.867234128 -0400 -@@ -1225,6 +1225,7 @@ desktop_init (AppearanceData *data, - GtkCellRenderer *cr; - char *url; - -+ data->wp_xml_list_loaded = FALSE; - data->wp_update_gconf = TRUE; - - data->wp_uris = NULL; -diff -rupN gnome-control-center-2.32.0.old/capplets/appearance/appearance.h gnome-control-center-2.32.0.new/capplets/appearance/appearance.h ---- a/capplets/appearance/appearance.h 2010-09-21 08:54:55.000000000 -0400 -+++ b/capplets/appearance/appearance.h 2010-11-05 20:51:58.050214779 -0400 -@@ -41,6 +41,7 @@ typedef struct - - /* desktop */ - GHashTable *wp_hash; -+ gboolean wp_xml_list_loaded; - gboolean wp_update_gconf; - GtkIconView *wp_view; - GtkTreeModel *wp_model; -diff -rupN gnome-control-center-2.32.0.old/capplets/appearance/gnome-wp-xml.c gnome-control-center-2.32.0.new/capplets/appearance/gnome-wp-xml.c ---- a/capplets/appearance/gnome-wp-xml.c 2010-09-21 08:54:55.000000000 -0400 -+++ b/capplets/appearance/gnome-wp-xml.c 2010-11-05 20:54:03.198634367 -0400 -@@ -378,6 +378,8 @@ void gnome_wp_xml_load_list (AppearanceD - gnome_wp_xml_load_from_dir (WALLPAPER_DATADIR, data); - - gnome_wp_load_legacy (data); -+ -+ data->wp_xml_list_loaded = TRUE; - } - - static void gnome_wp_list_flatten (const gchar * key, GnomeWPItem * item, -@@ -394,6 +396,11 @@ void gnome_wp_xml_save_list (AppearanceD - GSList * list = NULL; - gchar * wpfile; - -+ if (!data->wp_xml_list_loaded) { -+ g_hash_table_destroy (data->wp_hash); -+ return; -+ } -+ - g_hash_table_foreach (data->wp_hash, - (GHFunc) gnome_wp_list_flatten, &list); - g_hash_table_destroy (data->wp_hash); diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-gmodule.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-gmodule.patch deleted file mode 100644 index 7eed7a309085..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-gmodule.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/capplets/common/Makefile.am b/capplets/common/Makefile.am -index 70ad44f..52ea6e6 100644 ---- a/capplets/common/Makefile.am -+++ b/capplets/common/Makefile.am -@@ -48,7 +48,8 @@ libcommon_la_LIBADD = \ - $(METACITY_LIBS) \ - $(DBUS_LIBS) \ - $(GNOME_DESKTOP_LIBS) \ -- $(GIO_LIBS) -+ $(GIO_LIBS) \ -+ $(GMODULE_LIBS) - - gnome_theme_test_SOURCES = \ - gnome-theme-test.c -diff --git a/configure.ac b/configure.ac -index 4bc8d9b..f869f93 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -132,6 +132,7 @@ PKG_CHECK_MODULES(METACITY, libmetacity-private >= 2.23.1) - PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0) - PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon) - PKG_CHECK_MODULES(GIO, gio-2.0) -+PKG_CHECK_MODULES(GMODULE, gmodule-2.0) - - gtk_lib_dir=`$PKG_CONFIG --variable libdir gtk+-2.0` - gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-2.0` -diff --git a/libwindow-settings/Makefile.am b/libwindow-settings/Makefile.am -index ee6984d..0464597 100644 ---- a/libwindow-settings/Makefile.am -+++ b/libwindow-settings/Makefile.am -@@ -17,7 +17,9 @@ libgnome_window_settings_la_LDFLAGS = \ - -no-undefined \ - -version-info 1:0:0 - --libgnome_window_settings_la_LIBADD = $(GNOMECC_LIBS) -+libgnome_window_settings_la_LIBADD = \ -+ $(GNOMECC_LIBS) \ -+ $(GMODULE_LIBS) - - libgnome_window_settings_la_SOURCES = \ - gnome-window-manager.c \ diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler.patch deleted file mode 100644 index 6ab26b817fda..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler.patch +++ /dev/null @@ -1,1274 +0,0 @@ -diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.c gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.c 2011-03-27 15:30:55.000000000 +0200 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c 2011-03-27 15:31:26.000000000 +0200 -@@ -64,83 +64,26 @@ - } - - static void --web_radiobutton_toggled_cb (GtkWidget *togglebutton, GnomeDACapplet *capplet) --{ -- gint index; -- GnomeDAWebItem *item; -- const gchar *command; -- GError *error = NULL; -- -- index = gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->web_combo_box)); -- -- if (index == -1) -- return; -- -- item = (GnomeDAWebItem *) g_list_nth_data (capplet->web_browsers, index); -- if (item == NULL) -- return; -- -- if (togglebutton == capplet->new_win_radiobutton) { -- command = item->win_command; -- } -- else if (togglebutton == capplet->new_tab_radiobutton) { -- command = item->tab_command; -- } -- else { -- command = item->generic.command; -- } -- -- gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, command, &error); -- -- gtk_entry_set_text (GTK_ENTRY (capplet->web_browser_command_entry), command); -- -- if (error != NULL) { -- g_warning (_("Error saving configuration: %s"), error->message); -- g_error_free (error); -- } --} -- --static void - web_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet) - { - guint current_index; -- gboolean is_custom_active; -- gboolean has_net_remote; -- GnomeDAWebItem *item; -- GtkWidget *active = NULL; - - current_index = gtk_combo_box_get_active (combo); - - if (current_index < g_list_length (capplet->web_browsers)) { -+ GnomeDAURLItem *item; -+ GError *error = NULL; - -- item = (GnomeDAWebItem*) g_list_nth_data (capplet->web_browsers, current_index); -- has_net_remote = item->netscape_remote; -- is_custom_active = FALSE; -- -- } -- else { -- has_net_remote = FALSE; -- is_custom_active = TRUE; -- } -- gtk_widget_set_sensitive (capplet->default_radiobutton, has_net_remote); -- gtk_widget_set_sensitive (capplet->new_win_radiobutton, has_net_remote); -- gtk_widget_set_sensitive (capplet->new_tab_radiobutton, has_net_remote); -- -- gtk_widget_set_sensitive (capplet->web_browser_command_entry, is_custom_active); -- gtk_widget_set_sensitive (capplet->web_browser_command_label, is_custom_active); -- gtk_widget_set_sensitive (capplet->web_browser_terminal_checkbutton, is_custom_active); -- -- if (has_net_remote) { -- -- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton))) -- active = capplet->new_win_radiobutton; -- else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton))) -- active = capplet->new_tab_radiobutton; -- else -- active = capplet->default_radiobutton; -+ item = (GnomeDAURLItem*) g_list_nth_data (capplet->web_browsers, current_index); -+ if (item == NULL) -+ return; -+ -+ if (!g_app_info_set_as_default_for_type (item->app_info, "x-scheme-handler/http", &error) || -+ !g_app_info_set_as_default_for_type (item->app_info, "x-scheme-handler/https", &error)) { -+ g_warning (_("Error setting default browser: %s"), error->message); -+ g_error_free (error); -+ } - } -- -- web_radiobutton_toggled_cb (active, capplet); - } - - /* FIXME: Refactor these two functions below into one... */ -@@ -148,14 +91,23 @@ - mail_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet) - { - guint current_index; -- gboolean is_custom_active; - - current_index = gtk_combo_box_get_active (combo); -- is_custom_active = (current_index >= g_list_length (capplet->mail_readers)); - -- gtk_widget_set_sensitive (capplet->mail_reader_command_entry, is_custom_active); -- gtk_widget_set_sensitive (capplet->mail_reader_command_label, is_custom_active); -- gtk_widget_set_sensitive (capplet->mail_reader_terminal_checkbutton, is_custom_active); -+ if (current_index < g_list_length (capplet->mail_readers)) { -+ GnomeDAURLItem *item; -+ GError *error = NULL; -+ -+ item = (GnomeDAURLItem*) g_list_nth_data (capplet->mail_readers, current_index); -+ if (item == NULL) -+ return; -+ -+ if (!g_app_info_set_as_default_for_type (item->app_info, "x-scheme-handler/mailto", &error)) { -+ g_warning (_("Error setting default mailer: %s"), error->message); -+ g_error_free (error); -+ } -+ } -+ - } - - static void -@@ -297,221 +249,6 @@ - return (strcmp (((GnomeDAItem *) list_item)->command, (gchar *) command)); - } - --static gint --web_item_comp (gconstpointer item, gconstpointer command) --{ -- GnomeDAWebItem *web_list_item; -- -- web_list_item = (GnomeDAWebItem *) item; -- -- if (strcmp (web_list_item->generic.command, (gchar *) command) == 0) -- return 0; -- -- if (web_list_item->netscape_remote) { -- if (strcmp (web_list_item->tab_command, (gchar *) command) == 0) -- return 0; -- -- if (strcmp (web_list_item->win_command, (gchar *) command) == 0) -- return 0; -- } -- -- return (strcmp (web_list_item->generic.command, (gchar *) command)); --} -- --static void --web_gconf_changed_cb (GConfPropertyEditor *peditor, gchar *key, GConfValue *value, GnomeDACapplet *capplet) --{ -- GConfChangeSet *cs; -- GError *error = NULL; -- GList *list_entry; -- -- /* This function is used to update HTTPS,ABOUT and UNKNOWN handlers, which -- * should also use the same value as HTTP -- */ -- -- if (strcmp (key, DEFAULT_APPS_KEY_HTTP_EXEC) == 0) { -- gchar *short_browser, *pos; -- const gchar *value_str = gconf_value_get_string (value); -- -- cs = gconf_change_set_new (); -- -- gconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_EXEC, value); -- gconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_EXEC, value); -- gconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_EXEC, value); -- pos = strstr (value_str, " "); -- if (pos == NULL) -- short_browser = g_strdup (value_str); -- else -- short_browser = g_strndup (value_str, pos - value_str); -- gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_BROWSER_EXEC, short_browser); -- g_free (short_browser); -- -- list_entry = g_list_find_custom (capplet->web_browsers, -- value_str, -- (GCompareFunc) web_item_comp); -- -- if (list_entry) { -- GnomeDAWebItem *item = (GnomeDAWebItem *) list_entry->data; -- -- gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_BROWSER_NREMOTE, item->netscape_remote); -- } -- -- gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error); -- -- if (error != NULL) { -- g_warning (_("Error saving configuration: %s"), error->message); -- g_error_free (error); -- error = NULL; -- } -- -- gconf_change_set_unref (cs); -- } -- else if (strcmp (key, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM) == 0) { -- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->web_browser_terminal_checkbutton), -- gconf_value_get_bool (value)); -- -- cs = gconf_change_set_new (); -- -- gconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_NEEDS_TERM, value); -- gconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_NEEDS_TERM, value); -- gconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_NEEDS_TERM, value); -- gconf_change_set_set (cs, DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM, value); -- -- gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error); -- -- if (error != NULL) { -- g_warning (_("Error saving configuration: %s"), error->message); -- g_error_free (error); -- error = NULL; -- } -- -- gconf_change_set_unref (cs); -- } --} -- --static void --web_browser_update_radio_buttons (GnomeDACapplet *capplet, const gchar *command) --{ -- GList *entry; -- gboolean has_net_remote; -- -- entry = g_list_find_custom (capplet->web_browsers, command, (GCompareFunc) web_item_comp); -- -- if (entry) { -- GnomeDAWebItem *item = (GnomeDAWebItem *) entry->data; -- -- has_net_remote = item->netscape_remote; -- -- if (has_net_remote) { -- /* disable "toggle" signal emitting, thus preventing calling this function twice */ -- g_signal_handlers_block_matched (capplet->default_radiobutton, G_SIGNAL_MATCH_FUNC, 0, -- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); -- g_signal_handlers_block_matched (capplet->new_tab_radiobutton, G_SIGNAL_MATCH_FUNC, 0, -- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); -- g_signal_handlers_block_matched (capplet->new_win_radiobutton,G_SIGNAL_MATCH_FUNC, 0, -- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); -- -- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->default_radiobutton), -- strcmp (item->generic.command, command) == 0); -- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton), -- strcmp (item->tab_command, command) == 0); -- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton), -- strcmp (item->win_command, command) == 0); -- -- g_signal_handlers_unblock_matched (capplet->default_radiobutton, G_SIGNAL_MATCH_FUNC, 0, -- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); -- g_signal_handlers_unblock_matched (capplet->new_tab_radiobutton, G_SIGNAL_MATCH_FUNC, 0, -- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); -- g_signal_handlers_unblock_matched (capplet->new_win_radiobutton, G_SIGNAL_MATCH_FUNC, 0, -- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); -- } -- } -- else { -- has_net_remote = FALSE; -- } -- -- gtk_widget_set_sensitive (capplet->default_radiobutton, has_net_remote); -- gtk_widget_set_sensitive (capplet->new_win_radiobutton, has_net_remote); -- gtk_widget_set_sensitive (capplet->new_tab_radiobutton, has_net_remote); --} -- --static GConfValue* --web_combo_conv_to_widget (GConfPropertyEditor *peditor, const GConfValue *value) --{ -- GConfValue *ret; -- GList *entry, *handlers; -- const gchar *command; -- gint index; -- GnomeDACapplet *capplet; -- -- g_object_get (G_OBJECT (peditor), "data", &capplet, NULL); -- -- command = gconf_value_get_string (value); -- handlers = capplet->web_browsers; -- -- if (handlers) -- { -- entry = g_list_find_custom (handlers, command, (GCompareFunc) web_item_comp); -- if (entry) -- index = g_list_position (handlers, entry); -- else -- index = g_list_length (handlers) + 1; -- } -- else -- { -- /* if the item has no handlers lsit then select the Custom item */ -- index = 1; -- } -- -- web_browser_update_radio_buttons (capplet, command); -- -- ret = gconf_value_new (GCONF_VALUE_INT); -- gconf_value_set_int (ret, index); -- -- return ret; --} -- --static GConfValue* --web_combo_conv_from_widget (GConfPropertyEditor *peditor, const GConfValue *value) --{ -- GConfValue *ret; -- GList *handlers; -- gint index; -- GnomeDAWebItem *item; -- const gchar *command; -- GnomeDACapplet *capplet; -- -- g_object_get (G_OBJECT (peditor), "data", &capplet, NULL); -- -- index = gconf_value_get_int (value); -- handlers = capplet->web_browsers; -- -- item = g_list_nth_data (handlers, index); -- -- ret = gconf_value_new (GCONF_VALUE_STRING); -- if (!item) -- { -- /* if item was not found, this is probably the "Custom" item */ -- /* XXX: returning "" as the value here is not ideal, but required to -- * prevent the combo box from jumping back to the previous value if the -- * user has selected Custom */ -- gconf_value_set_string (ret, ""); -- return ret; -- } -- else -- { -- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton)) && item->netscape_remote == TRUE) -- command = item->win_command; -- else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton)) && item->netscape_remote == TRUE) -- command = item->tab_command; -- else -- command = item->generic.command; -- -- gconf_value_set_string (ret, command); -- return ret; -- } --} -- - static GConfValue* - combo_conv_to_widget (GConfPropertyEditor *peditor, const GConfValue *value) - { -@@ -632,7 +369,7 @@ - } - - static void --fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list) -+fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list, gboolean add_custom) - { - GList *entry; - GtkTreeModel *model; -@@ -644,8 +381,10 @@ - theme = gtk_icon_theme_get_default (); - } - -- gtk_combo_box_set_row_separator_func (combo_box, is_separator, -- GINT_TO_POINTER (g_list_length (app_list)), NULL); -+ if (add_custom) { -+ gtk_combo_box_set_row_separator_func (combo_box, is_separator, -+ GINT_TO_POINTER (g_list_length (app_list)), NULL); -+ } - - model = GTK_TREE_MODEL (gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING)); - gtk_combo_box_set_model (combo_box, model); -@@ -683,13 +422,41 @@ - g_object_unref (pixbuf); - } - -- gtk_list_store_append (GTK_LIST_STORE (model), &iter); -- gtk_list_store_set (GTK_LIST_STORE (model), &iter, -1); -- gtk_list_store_append (GTK_LIST_STORE (model), &iter); -- gtk_list_store_set (GTK_LIST_STORE (model), &iter, -- PIXBUF_COL, NULL, -- TEXT_COL, _("Custom"), -- -1); -+ if (add_custom) { -+ gtk_list_store_append (GTK_LIST_STORE (model), &iter); -+ gtk_list_store_set (GTK_LIST_STORE (model), &iter, -1); -+ gtk_list_store_append (GTK_LIST_STORE (model), &iter); -+ gtk_list_store_set (GTK_LIST_STORE (model), &iter, -+ PIXBUF_COL, NULL, -+ TEXT_COL, _("Custom"), -+ -1); -+ } -+} -+ -+static void -+select_current_for_uri_scheme (GtkComboBox *combo_box, GList *app_list, const gchar *uri) -+{ -+ GAppInfo *current_default; -+ GList *l; -+ int index; -+ -+ current_default = g_app_info_get_default_for_uri_scheme (uri); -+ if (!current_default) -+ return; -+ -+ index = 0; -+ -+ for (l = app_list; l != NULL; l = l->next) { -+ if (!g_app_info_equal (current_default, ((GnomeDAURLItem *) l->data)->app_info)) { -+ index++; -+ continue; -+ } -+ -+ gtk_combo_box_set_active (combo_box, index); -+ break; -+ } -+ -+ g_object_unref (current_default); - } - - static GtkWidget* -@@ -702,7 +469,6 @@ - static void - show_dialog (GnomeDACapplet *capplet, const gchar *start_page) - { -- GObject *obj; - GtkBuilder *builder; - guint builder_result; - -@@ -732,17 +498,6 @@ - capplet->window = _gtk_builder_get_widget (builder,"preferred_apps_dialog"); - g_signal_connect (capplet->window, "response", G_CALLBACK (close_cb), NULL); - -- capplet->web_browser_command_entry = _gtk_builder_get_widget (builder, "web_browser_command_entry"); -- capplet->web_browser_command_label = _gtk_builder_get_widget (builder, "web_browser_command_label"); -- capplet->web_browser_terminal_checkbutton = _gtk_builder_get_widget(builder, "web_browser_terminal_checkbutton"); -- capplet->default_radiobutton = _gtk_builder_get_widget (builder, "web_browser_default_radiobutton"); -- capplet->new_win_radiobutton = _gtk_builder_get_widget (builder, "web_browser_new_win_radiobutton"); -- capplet->new_tab_radiobutton = _gtk_builder_get_widget (builder, "web_browser_new_tab_radiobutton"); -- -- capplet->mail_reader_command_entry = _gtk_builder_get_widget (builder, "mail_reader_command_entry"); -- capplet->mail_reader_command_label = _gtk_builder_get_widget (builder, "mail_reader_command_label"); -- capplet->mail_reader_terminal_checkbutton = _gtk_builder_get_widget (builder, "mail_reader_terminal_checkbutton"); -- - capplet->terminal_command_entry = _gtk_builder_get_widget (builder, "terminal_command_entry"); - capplet->terminal_command_label = _gtk_builder_get_widget (builder, "terminal_command_label"); - capplet->terminal_exec_flag_entry = _gtk_builder_get_widget (builder, "terminal_exec_flag_entry"); -@@ -770,12 +525,15 @@ - g_signal_connect (capplet->window, "screen-changed", G_CALLBACK (screen_changed_cb), capplet); - screen_changed_cb (capplet->window, gdk_screen_get_default (), capplet); - -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers); -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers); -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals); -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players); -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats); -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats); -+ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, FALSE); -+ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, FALSE); -+ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals, TRUE); -+ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players, TRUE); -+ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats, TRUE); -+ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats, TRUE); -+ -+ select_current_for_uri_scheme (GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, "http"); -+ select_current_for_uri_scheme (GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, "mailto"); - - g_signal_connect (capplet->web_combo_box, "changed", G_CALLBACK (web_combo_changed_cb), capplet); - g_signal_connect (capplet->mail_combo_box, "changed", G_CALLBACK (mail_combo_changed_cb), capplet); -@@ -784,53 +542,8 @@ - g_signal_connect (capplet->visual_combo_box, "changed", G_CALLBACK (visual_combo_changed_cb), capplet); - g_signal_connect (capplet->mobility_combo_box, "changed", G_CALLBACK (mobility_combo_changed_cb), capplet); - -- -- g_signal_connect (capplet->default_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet); -- g_signal_connect (capplet->new_win_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet); -- g_signal_connect (capplet->new_tab_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet); -- - /* Setup GConfPropertyEditors */ - -- /* Web Browser */ -- gconf_peditor_new_combo_box (NULL, -- DEFAULT_APPS_KEY_HTTP_EXEC, -- capplet->web_combo_box, -- "conv-from-widget-cb", web_combo_conv_from_widget, -- "conv-to-widget-cb", web_combo_conv_to_widget, -- "data", capplet, -- NULL); -- -- obj = gconf_peditor_new_string (NULL, -- DEFAULT_APPS_KEY_HTTP_EXEC, -- capplet->web_browser_command_entry, -- NULL); -- g_signal_connect (obj, "value-changed", G_CALLBACK (web_gconf_changed_cb), capplet); -- -- obj = gconf_peditor_new_boolean (NULL, -- DEFAULT_APPS_KEY_HTTP_NEEDS_TERM, -- capplet->web_browser_terminal_checkbutton, -- NULL); -- g_signal_connect (obj, "value-changed", G_CALLBACK (web_gconf_changed_cb), capplet); -- -- /* Mailer */ -- gconf_peditor_new_combo_box (NULL, -- DEFAULT_APPS_KEY_MAILER_EXEC, -- capplet->mail_combo_box, -- "conv-from-widget-cb", combo_conv_from_widget, -- "conv-to-widget-cb", combo_conv_to_widget, -- "data", capplet->mail_readers, -- NULL); -- -- gconf_peditor_new_string (NULL, -- DEFAULT_APPS_KEY_MAILER_EXEC, -- capplet->mail_reader_command_entry, -- NULL); -- -- gconf_peditor_new_boolean (NULL, -- DEFAULT_APPS_KEY_MAILER_NEEDS_TERM, -- capplet->mail_reader_terminal_checkbutton, -- NULL); -- - /* Media player */ - gconf_peditor_new_combo_box (NULL, - DEFAULT_APPS_KEY_MEDIA_EXEC, -diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.h gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.h ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.h 2011-03-27 15:30:55.000000000 +0200 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.h 2011-03-27 15:31:26.000000000 +0200 -@@ -85,17 +85,6 @@ - GtkWidget *visual_combo_box; - GtkWidget *mobility_combo_box; - -- GtkWidget *web_browser_command_entry; -- GtkWidget *web_browser_command_label; -- GtkWidget *web_browser_terminal_checkbutton; -- GtkWidget *default_radiobutton; -- GtkWidget *new_win_radiobutton; -- GtkWidget *new_tab_radiobutton; -- -- GtkWidget *mail_reader_command_entry; -- GtkWidget *mail_reader_command_label; -- GtkWidget *mail_reader_terminal_checkbutton; -- - GtkWidget *terminal_command_entry; - GtkWidget *terminal_command_label; - GtkWidget *terminal_exec_flag_entry; -diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-item.c gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.c ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-item.c 2011-03-27 15:30:55.000000000 +0200 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.c 2011-03-27 15:31:26.000000000 +0200 -@@ -21,12 +21,12 @@ - #include "gnome-da-capplet.h" - #include "gnome-da-item.h" - --GnomeDAWebItem* --gnome_da_web_item_new (void) -+GnomeDAURLItem* -+gnome_da_url_item_new (void) - { -- GnomeDAWebItem *item = NULL; -+ GnomeDAURLItem *item = NULL; - -- item = g_new0 (GnomeDAWebItem, 1); -+ item = g_new0 (GnomeDAURLItem, 1); - - return item; - } -@@ -72,7 +72,7 @@ - } - - void --gnome_da_web_item_free (GnomeDAWebItem *item) -+gnome_da_url_item_free (GnomeDAURLItem *item) - { - g_return_if_fail (item != NULL); - -@@ -82,8 +82,7 @@ - g_free (item->generic.icon_name); - g_free (item->generic.icon_path); - -- g_free (item->tab_command); -- g_free (item->win_command); -+ g_object_unref (item->app_info); - - g_free (item); - } -diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-item.h gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.h ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-item.h 2011-03-27 15:30:55.000000000 +0200 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.h 2011-03-27 15:31:26.000000000 +0200 -@@ -25,7 +25,7 @@ - - typedef struct _GnomeDAItem GnomeDAItem; - --typedef struct _GnomeDAWebItem GnomeDAWebItem; -+typedef struct _GnomeDAURLItem GnomeDAURLItem; - typedef struct _GnomeDATermItem GnomeDATermItem; - typedef struct _GnomeDASimpleItem GnomeDASimpleItem; - typedef struct _GnomeDAVisualItem GnomeDAVisualItem; -@@ -39,17 +39,14 @@ - gchar *icon_path; - }; - --struct _GnomeDAWebItem { -+struct _GnomeDASimpleItem { - GnomeDAItem generic; - gboolean run_in_terminal; -- gboolean netscape_remote; -- gchar *tab_command; -- gchar *win_command; - }; - --struct _GnomeDASimpleItem { -+struct _GnomeDAURLItem { - GnomeDAItem generic; -- gboolean run_in_terminal; -+ GAppInfo *app_info; - }; - - struct _GnomeDATermItem { -@@ -67,13 +64,13 @@ - gboolean run_at_startup; - }; - --GnomeDAWebItem* gnome_da_web_item_new (void); - GnomeDATermItem* gnome_da_term_item_new (void); -+GnomeDAURLItem* gnome_da_url_item_new (void); - GnomeDASimpleItem* gnome_da_simple_item_new (void); - GnomeDAVisualItem* gnome_da_visual_item_new (void); - GnomeDAMobilityItem* gnome_da_mobility_item_new (void); --void gnome_da_web_item_free (GnomeDAWebItem *item); - void gnome_da_term_item_free (GnomeDATermItem *item); -+void gnome_da_url_item_free (GnomeDAURLItem *item); - void gnome_da_simple_item_free (GnomeDASimpleItem *item); - void gnome_da_visual_item_free (GnomeDAVisualItem *item); - void gnome_da_mobility_item_free (GnomeDAMobilityItem *item); -diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-xml.c gnome-control-center-2.32.1/capplets/default-applications/gnome-da-xml.c ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-xml.c 2011-03-27 15:30:55.000000000 +0200 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-xml.c 2011-03-27 15:31:26.000000000 +0200 -@@ -47,7 +47,7 @@ - if (!xmlStrncmp (element->name, xml_val_name, len)) { - xmlChar *cont = xmlNodeGetContent (element); - -- if (!xmlStrcasecmp (cont, "true") || !xmlStrcasecmp (cont, "1")) -+ if (!xmlStrcasecmp (cont, (const xmlChar *) "true") || !xmlStrcasecmp (cont, (const xmlChar *) "1")) - ret_val = TRUE; - else - ret_val = FALSE; -@@ -91,7 +91,7 @@ - } - else { - for (i = 0; sys_langs[i] != NULL; i++) { -- if (!strcmp (sys_langs[i], node_lang)) { -+ if (!strcmp ((const char *) sys_langs[i], (const char *) node_lang)) { - ret_val = (gchar *) xmlNodeGetContent (element); - /* since sys_langs is sorted from most desirable to - * least desirable, exit at first match -@@ -109,7 +109,7 @@ - } - - static gboolean --is_executable_valid (gchar *executable) -+is_executable_valid (const gchar *executable) - { - gchar *path; - -@@ -129,8 +129,6 @@ - xmlDoc *xml_doc; - xmlNode *root, *section, *element; - gchar *executable; -- GnomeDAWebItem *web_item; -- GnomeDASimpleItem *mail_item; - GnomeDASimpleItem *media_item; - GnomeDATermItem *term_item; - GnomeDAVisualItem *visual_item; -@@ -144,56 +142,9 @@ - root = xmlDocGetRootElement (xml_doc); - - for (section = root->children; section != NULL; section = section->next) { -- if (!xmlStrncmp (section->name, "web-browsers", 12)) { -+ if (!xmlStrncmp (section->name, (const xmlChar *) "terminals", 9)) { - for (element = section->children; element != NULL; element = element->next) { -- if (!xmlStrncmp (element->name, "web-browser", 11)) { -- executable = gnome_da_xml_get_string (element, "executable"); -- if (is_executable_valid (executable)) { -- web_item = gnome_da_web_item_new (); -- -- web_item->generic.name = gnome_da_xml_get_string (element, "name"); -- web_item->generic.executable = executable; -- web_item->generic.command = gnome_da_xml_get_string (element, "command"); -- web_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name"); -- -- web_item->run_in_terminal = gnome_da_xml_get_bool (element, "run-in-terminal"); -- web_item->netscape_remote = gnome_da_xml_get_bool (element, "netscape-remote"); -- if (web_item->netscape_remote) { -- web_item->tab_command = gnome_da_xml_get_string (element, "tab-command"); -- web_item->win_command = gnome_da_xml_get_string (element, "win-command"); -- } -- -- capplet->web_browsers = g_list_append (capplet->web_browsers, web_item); -- } -- else -- g_free (executable); -- } -- } -- } -- else if (!xmlStrncmp (section->name, "mail-readers", 12)) { -- for (element = section->children; element != NULL; element = element->next) { -- if (!xmlStrncmp (element->name, "mail-reader", 11)) { -- executable = gnome_da_xml_get_string (element, "executable"); -- if (is_executable_valid (executable)) { -- mail_item = gnome_da_simple_item_new (); -- -- mail_item->generic.name = gnome_da_xml_get_string (element, "name"); -- mail_item->generic.executable = executable; -- mail_item->generic.command = gnome_da_xml_get_string (element, "command"); -- mail_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name"); -- -- mail_item->run_in_terminal = gnome_da_xml_get_bool (element, "run-in-terminal"); -- -- capplet->mail_readers = g_list_append (capplet->mail_readers, mail_item); -- } -- else -- g_free (executable); -- } -- } -- } -- else if (!xmlStrncmp (section->name, "terminals", 9)) { -- for (element = section->children; element != NULL; element = element->next) { -- if (!xmlStrncmp (element->name, "terminal", 8)) { -+ if (!xmlStrncmp (element->name, (const xmlChar *) "terminal", 8)) { - executable = gnome_da_xml_get_string (element, "executable"); - if (is_executable_valid (executable)) { - term_item = gnome_da_term_item_new (); -@@ -212,9 +163,9 @@ - } - } - } -- else if (!xmlStrncmp (section->name, "media-players", 13)) { -+ else if (!xmlStrncmp (section->name, (const xmlChar *) "media-players", 13)) { - for (element = section->children; element != NULL; element = element->next) { -- if (!xmlStrncmp (element->name, "media-player", 12)) { -+ if (!xmlStrncmp (element->name, (const xmlChar *) "media-player", 12)) { - executable = gnome_da_xml_get_string (element, "executable"); - if (is_executable_valid (executable)) { - media_item = gnome_da_simple_item_new (); -@@ -233,9 +184,9 @@ - } - } - } -- else if (!xmlStrncmp (section->name, "a11y-visual", 11)) { -+ else if (!xmlStrncmp (section->name, (const xmlChar *) "a11y-visual", 11)) { - for (element = section->children; element != NULL; element = element->next) { -- if (!xmlStrncmp (element->name, "visual", 6)) { -+ if (!xmlStrncmp (element->name, (const xmlChar *) "visual", 6)) { - executable = gnome_da_xml_get_string (element,"executable"); - if (is_executable_valid (executable)) { - visual_item = gnome_da_visual_item_new (); -@@ -254,9 +205,9 @@ - } - } - } -- else if (!xmlStrncmp (section->name, "a11y-mobility", 13)) { -+ else if (!xmlStrncmp (section->name, (const xmlChar *) "a11y-mobility", 13)) { - for (element = section->children; element != NULL; element = element->next) { -- if (!xmlStrncmp (element->name, "mobility", 8)) { -+ if (!xmlStrncmp (element->name, (const xmlChar *) "mobility", 8)) { - executable = gnome_da_xml_get_string (element,"executable"); - if (is_executable_valid (executable)) { - mobility_item = gnome_da_mobility_item_new (); -@@ -280,11 +231,46 @@ - xmlFreeDoc (xml_doc); - } - -+static GList * -+load_url_handlers (GnomeDACapplet *capplet, const gchar *scheme) -+{ -+ GList *app_list, *l, *ret; -+ -+ app_list = g_app_info_get_all_for_type (scheme); -+ ret = NULL; -+ -+ for (l = app_list; l != NULL; l = l->next) { -+ const gchar *executable; -+ GAppInfo *app_info = l->data; -+ -+ executable = g_app_info_get_executable (app_info); -+ if (is_executable_valid (executable)) { -+ GnomeDAURLItem *url_item; -+ -+ url_item = gnome_da_url_item_new (); -+ url_item->generic.name = g_strdup (g_app_info_get_display_name (app_info)); -+ url_item->generic.executable = g_strdup (executable); -+ url_item->generic.command = g_strdup (g_app_info_get_commandline (app_info)); -+ url_item->generic.icon_name = g_strdup (g_app_info_get_name (app_info)); -+ /* Steal the reference */ -+ url_item->app_info = app_info; -+ -+ ret = g_list_prepend (ret, url_item); -+ } else { -+ g_object_unref (app_info); -+ } -+ } -+ g_list_free (app_list); -+ -+ return g_list_reverse (ret); -+} -+ - void - gnome_da_xml_load_list (GnomeDACapplet *capplet) - { - GDir *app_dir = g_dir_open (GNOMECC_APPS_DIR, 0, NULL); - -+ /* First load all applications from the XML files */ - if (app_dir != NULL) { - const gchar *extra_file; - gchar *filename; -@@ -299,13 +285,17 @@ - } - g_dir_close (app_dir); - } -+ -+ /* Now load URL handlers */ -+ capplet->web_browsers = load_url_handlers (capplet, "x-scheme-handler/http"); -+ capplet->mail_readers = load_url_handlers (capplet, "x-scheme-handler/mailto"); - } - - void - gnome_da_xml_free (GnomeDACapplet *capplet) - { -- g_list_foreach (capplet->web_browsers, (GFunc) gnome_da_web_item_free, NULL); -- g_list_foreach (capplet->mail_readers, (GFunc) gnome_da_simple_item_free, NULL); -+ g_list_foreach (capplet->web_browsers, (GFunc) gnome_da_url_item_free, NULL); -+ g_list_foreach (capplet->mail_readers, (GFunc) gnome_da_url_item_free, NULL); - g_list_foreach (capplet->terminals, (GFunc) gnome_da_term_item_free, NULL); - g_list_foreach (capplet->media_players, (GFunc) gnome_da_simple_item_free, NULL); - g_list_foreach (capplet->visual_ats, (GFunc) gnome_da_visual_item_free, NULL); -diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-default-applications-properties.ui gnome-control-center-2.32.1/capplets/default-applications/gnome-default-applications-properties.ui ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-default-applications-properties.ui 2011-03-27 15:30:55.000000000 +0200 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-default-applications-properties.ui 2011-03-27 15:31:26.000000000 +0200 -@@ -1,4 +1,4 @@ --<?xml version="1.0"?> -+<?xml version="1.0" encoding="UTF-8"?> - <interface> - <requires lib="gtk+" version="2.16"/> - <!-- interface-naming-policy toplevel-contextual --> -@@ -69,122 +69,7 @@ - </packing> - </child> - <child> -- <object class="GtkTable" id="web_browser_options_table"> -- <property name="visible">True</property> -- <property name="n_rows">4</property> -- <property name="n_columns">3</property> -- <property name="column_spacing">12</property> -- <property name="row_spacing">6</property> -- <child> -- <object class="GtkEntry" id="web_browser_command_entry"> -- <property name="visible">True</property> -- <property name="can_focus">True</property> -- <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property> -- </object> -- <packing> -- <property name="left_attach">1</property> -- <property name="right_attach">2</property> -- <property name="top_attach">3</property> -- <property name="bottom_attach">4</property> -- <property name="y_options"></property> -- </packing> -- </child> -- <child> -- <object class="GtkCheckButton" id="web_browser_terminal_checkbutton"> -- <property name="label" translatable="yes">Run in t_erminal</property> -- <property name="visible">True</property> -- <property name="sensitive">False</property> -- <property name="can_focus">True</property> -- <property name="receives_default">False</property> -- <property name="use_underline">True</property> -- <property name="draw_indicator">True</property> -- </object> -- <packing> -- <property name="left_attach">2</property> -- <property name="right_attach">3</property> -- <property name="top_attach">3</property> -- <property name="bottom_attach">4</property> -- <property name="x_options">GTK_FILL</property> -- <property name="y_options"></property> -- </packing> -- </child> -- <child> -- <object class="GtkRadioButton" id="web_browser_default_radiobutton"> -- <property name="label" translatable="yes">Open link with web browser _default</property> -- <property name="visible">True</property> -- <property name="sensitive">False</property> -- <property name="can_focus">True</property> -- <property name="receives_default">False</property> -- <property name="use_underline">True</property> -- <property name="active">True</property> -- <property name="draw_indicator">True</property> -- </object> -- <packing> -- <property name="right_attach">3</property> -- <property name="x_options">GTK_FILL</property> -- <property name="y_options"></property> -- </packing> -- </child> -- <child> -- <object class="GtkRadioButton" id="web_browser_new_tab_radiobutton"> -- <property name="label" translatable="yes">Open link in new _tab</property> -- <property name="visible">True</property> -- <property name="sensitive">False</property> -- <property name="can_focus">True</property> -- <property name="receives_default">False</property> -- <property name="use_underline">True</property> -- <property name="draw_indicator">True</property> -- <property name="group">web_browser_default_radiobutton</property> -- </object> -- <packing> -- <property name="right_attach">3</property> -- <property name="top_attach">2</property> -- <property name="bottom_attach">3</property> -- <property name="x_options">GTK_FILL</property> -- <property name="y_options"></property> -- </packing> -- </child> -- <child> -- <object class="GtkRadioButton" id="web_browser_new_win_radiobutton"> -- <property name="label" translatable="yes">Open link in new _window</property> -- <property name="visible">True</property> -- <property name="sensitive">False</property> -- <property name="can_focus">True</property> -- <property name="receives_default">False</property> -- <property name="use_underline">True</property> -- <property name="draw_indicator">True</property> -- <property name="group">web_browser_default_radiobutton</property> -- </object> -- <packing> -- <property name="right_attach">3</property> -- <property name="top_attach">1</property> -- <property name="bottom_attach">2</property> -- <property name="x_options">GTK_FILL</property> -- <property name="y_options"></property> -- </packing> -- </child> -- <child> -- <object class="GtkLabel" id="web_browser_command_label"> -- <property name="visible">True</property> -- <property name="sensitive">False</property> -- <property name="xalign">0</property> -- <property name="label" translatable="yes">C_ommand:</property> -- <property name="use_underline">True</property> -- <property name="mnemonic_widget">web_browser_command_entry</property> -- </object> -- <packing> -- <property name="top_attach">3</property> -- <property name="bottom_attach">4</property> -- <property name="x_options">GTK_FILL</property> -- <property name="y_options"></property> -- </packing> -- </child> -- </object> -- <packing> -- <property name="expand">False</property> -- <property name="fill">False</property> -- <property name="position">1</property> -- </packing> -+ <placeholder/> - </child> - </object> - <packing> -@@ -250,58 +135,7 @@ - </packing> - </child> - <child> -- <object class="GtkTable" id="mail_reader_options_table"> -- <property name="visible">True</property> -- <property name="n_columns">3</property> -- <property name="column_spacing">12</property> -- <property name="row_spacing">6</property> -- <child> -- <object class="GtkLabel" id="mail_reader_command_label"> -- <property name="visible">True</property> -- <property name="sensitive">False</property> -- <property name="xalign">0</property> -- <property name="label" translatable="yes">Co_mmand:</property> -- <property name="use_underline">True</property> -- <property name="mnemonic_widget">mail_reader_command_entry</property> -- </object> -- <packing> -- <property name="x_options">GTK_FILL</property> -- <property name="y_options"></property> -- </packing> -- </child> -- <child> -- <object class="GtkEntry" id="mail_reader_command_entry"> -- <property name="visible">True</property> -- <property name="can_focus">True</property> -- <property name="tooltip_text" translatable="yes">All %s occurrences will be replaced with actual link</property> -- </object> -- <packing> -- <property name="left_attach">1</property> -- <property name="right_attach">2</property> -- <property name="y_options"></property> -- </packing> -- </child> -- <child> -- <object class="GtkCheckButton" id="mail_reader_terminal_checkbutton"> -- <property name="label" translatable="yes">Run in t_erminal</property> -- <property name="visible">True</property> -- <property name="sensitive">False</property> -- <property name="can_focus">True</property> -- <property name="receives_default">False</property> -- <property name="use_underline">True</property> -- <property name="draw_indicator">True</property> -- </object> -- <packing> -- <property name="left_attach">2</property> -- <property name="right_attach">3</property> -- <property name="x_options">GTK_FILL</property> -- <property name="y_options"></property> -- </packing> -- </child> -- </object> -- <packing> -- <property name="position">1</property> -- </packing> -+ <placeholder/> - </child> - </object> - <packing> -diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-default-applications.xml.in gnome-control-center-2.32.1/capplets/default-applications/gnome-default-applications.xml.in ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-default-applications.xml.in 2011-03-27 15:30:55.000000000 +0200 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-default-applications.xml.in 2011-03-27 15:31:26.000000000 +0200 -@@ -4,245 +4,6 @@ - - <!-- Remember to never use the same string for <command>, <tab-command> and <win-command> entries --> - -- <web-browsers> -- <web-browser> -- <_name>Opera</_name> -- <executable>opera</executable> -- <command>opera %s</command> -- <icon-name>opera</icon-name> -- <run-in-terminal>false</run-in-terminal> -- <netscape-remote>true</netscape-remote> -- <tab-command>opera -newpage %s</tab-command> -- <win-command>opera -newwindow %s</win-command> -- </web-browser> -- <web-browser> -- <_name>Debian Sensible Browser</_name> -- <executable>sensible-browser</executable> -- <command>sensible-browser %s</command> -- <icon-name></icon-name> -- <run-in-terminal>false</run-in-terminal> -- <netscape-remote>false</netscape-remote> -- </web-browser> -- <web-browser> -- <_name>Epiphany Web Browser</_name> -- <executable>epiphany</executable> -- <command>epiphany %s</command> -- <icon-name>web-browser</icon-name> -- <run-in-terminal>false</run-in-terminal> -- <netscape-remote>true</netscape-remote> -- <tab-command>epiphany --new-tab %s</tab-command> -- <win-command>epiphany --new-window %s</win-command> -- </web-browser> -- <web-browser> -- <_name>Galeon</_name> -- <executable>galeon</executable> -- <command>galeon %s</command> -- <icon-name>galeon</icon-name> -- <run-in-terminal>false</run-in-terminal> -- <netscape-remote>true</netscape-remote> -- <tab-command>galeon -n %s</tab-command> -- <win-command>galeon -w %s</win-command> -- </web-browser> -- <web-browser> -- <_name>Encompass</_name> -- <executable>encompass</executable> -- <command>encompass %s</command> -- <icon-name>encompass</icon-name> -- <run-in-terminal>false</run-in-terminal> -- <netscape-remote>false</netscape-remote> -- </web-browser> -- <web-browser> -- <_name>Firebird</_name> -- <executable>mozilla-firebird</executable> -- <command>mozilla-firebird %s</command> -- <icon-name></icon-name> -- <run-in-terminal>false</run-in-terminal> -- <netscape-remote>true</netscape-remote> -- <tab-command>mozilla-firebird -remote "openurl(%s,new-tab)"</tab-command> -- <win-command>mozilla-firebird -remote "openurl(%s,new-window)"</win-command> -- </web-browser> -- <web-browser> -- <_name>Firefox</_name> -- <executable>firefox</executable> -- <command>firefox %s</command> -- <icon-name>firefox</icon-name> -- <run-in-terminal>false</run-in-terminal> -- <netscape-remote>true</netscape-remote> -- <tab-command>firefox -new-tab "%s"</tab-command> -- <win-command>firefox -new-window "%s"</win-command> -- </web-browser> -- <web-browser> -- <_name>Iceweasel</_name> -- <executable>iceweasel</executable> -- <command>iceweasel %s</command> -- <icon-name>iceweasel</icon-name> -- <run-in-terminal>false</run-in-terminal> -- <netscape-remote>true</netscape-remote> -- <tab-command>iceweasel -new-tab "%s"</tab-command> -- <win-command>iceweasel -new-window "%s"</win-command> -- </web-browser> -- <web-browser> -- <_name>Mozilla 1.6</_name> -- <executable>mozilla-1.6</executable> -- <command>mozilla-1.6 %s</command> -- <icon-name>mozilla-icon</icon-name> -- <run-in-terminal>false</run-in-terminal> -- <netscape-remote>true</netscape-remote> -- <tab-command>mozilla-1.6 -remote "openurl(%s,new-tab)"</tab-command> -- <win-command>mozilla-1.6 -remote "openurl(%s,new-window)"</win-command> -- </web-browser> -- <web-browser> -- <_name>Mozilla</_name> -- <executable>mozilla</executable> -- <command>mozilla %s</command> -- <icon-name>mozilla-icon</icon-name> -- <run-in-terminal>false</run-in-terminal> -- <netscape-remote>true</netscape-remote> -- <tab-command>mozilla -remote "openurl(%s,new-tab)"</tab-command> -- <win-command>mozilla -remote "openurl(%s,new-window)"</win-command> -- </web-browser> -- <web-browser> -- <_name>SeaMonkey</_name> -- <executable>seamonkey</executable> -- <command>seamonkey %s</command> -- <icon-name>seamonkey</icon-name> -- <run-in-terminal>false</run-in-terminal> -- <netscape-remote>true</netscape-remote> -- <tab-command>seamonkey -remote "openurl(%s,new-tab)"</tab-command> -- <win-command>seamonkey -remote "openurl(%s,new-window)"</win-command> -- </web-browser> -- <web-browser> -- <_name>Iceape</_name> -- <executable>iceape</executable> -- <command>iceape %s</command> -- <icon-name>iceape</icon-name> -- <run-in-terminal>false</run-in-terminal> -- <netscape-remote>true</netscape-remote> -- <tab-command>iceape -remote "openurl(%s,new-tab)"</tab-command> -- <win-command>iceape -remote "openurl(%s,new-window)"</win-command> -- </web-browser> -- <web-browser> -- <_name>Netscape Communicator</_name> -- <executable>netscape</executable> -- <command>netscape %s</command> -- <icon-name>netscape</icon-name> -- <run-in-terminal>false</run-in-terminal> -- <netscape-remote>true</netscape-remote> -- <tab-command>netscape -remote "openurl(%s,new-tab)"</tab-command> -- <win-command>netscape -remote "openurl(%s,new-window)"</win-command> -- </web-browser> -- <web-browser> -- <_name>Konqueror</_name> -- <executable>konqueror</executable> -- <command>konqueror %s</command> -- <icon-name>konqueror</icon-name> -- <run-in-terminal>false</run-in-terminal> -- <netscape-remote>false</netscape-remote> -- </web-browser> -- <web-browser> -- <_name>Midori</_name> -- <executable>midori</executable> -- <command>midori %s</command> -- <icon-name>midori</icon-name> -- <run-in-terminal>false</run-in-terminal> -- <netscape-remote>false</netscape-remote> -- </web-browser> -- </web-browsers> -- -- <mail-readers> -- <mail-reader> -- <_name>Evolution Mail Reader</_name> -- <executable>evolution</executable> -- <command>evolution %s</command> -- <icon-name>evolution</icon-name> -- <run-in-terminal>false</run-in-terminal> -- </mail-reader> -- <mail-reader> -- <_name>Balsa</_name> -- <executable>balsa</executable> -- <command>balsa -m %s</command> -- <icon-name>gnome-balsa2</icon-name> -- <run-in-terminal>false</run-in-terminal> -- </mail-reader> -- <mail-reader> -- <_name>KMail</_name> -- <executable>kmail</executable> -- <command>kmail %s</command> -- <icon-name>kmail</icon-name> -- <run-in-terminal>false</run-in-terminal> -- </mail-reader> -- <mail-reader> -- <_name>Icedove</_name> -- <executable>icedove</executable> -- <command>icedove %s</command> -- <icon-name>icedove</icon-name> -- <run-in-terminal>false</run-in-terminal> -- </mail-reader> -- <mail-reader> -- <_name>Thunderbird</_name> -- <executable>thunderbird</executable> -- <command>thunderbird %s</command> -- <icon-name>thunderbird</icon-name> -- <run-in-terminal>false</run-in-terminal> -- </mail-reader> -- <mail-reader> -- <_name>Mozilla Thunderbird</_name> -- <executable>mozilla-thunderbird</executable> -- <command>mozilla-thunderbird %s</command> -- <icon-name>thunderbird</icon-name> -- <run-in-terminal>false</run-in-terminal> -- </mail-reader> -- <mail-reader> -- <_name>Mozilla Mail</_name> -- <executable>mozilla</executable> -- <command>mozilla -mail %s</command> -- <icon-name>mozilla-mail-icon</icon-name> -- <run-in-terminal>false</run-in-terminal> -- </mail-reader> -- <mail-reader> -- <_name>SeaMonkey Mail</_name> -- <executable>seamonkey</executable> -- <command>seamonkey -mail %s</command> -- <icon-name>seamonkey</icon-name> -- <run-in-terminal>false</run-in-terminal> -- </mail-reader> -- <mail-reader> -- <_name>Iceape Mail</_name> -- <executable>iceape</executable> -- <command>iceape -mail %s</command> -- <icon-name>iceape</icon-name> -- <run-in-terminal>false</run-in-terminal> -- </mail-reader> -- <mail-reader> -- <_name>Mutt</_name> -- <executable>mutt</executable> -- <command>mutt %s</command> -- <icon-name>gnome-mime-application-x-executable</icon-name> -- <run-in-terminal>true</run-in-terminal> -- </mail-reader> -- <mail-reader> -- <_name>Claws Mail</_name> -- <executable>claws-mail</executable> -- <command>claws-mail --compose %s</command> -- <icon-name>claws-mail</icon-name> -- <run-in-terminal>false</run-in-terminal> -- </mail-reader> -- <mail-reader> -- <_name>Sylpheed-Claws</_name> -- <executable>sylpheed-claws</executable> -- <command>sylpheed-claws --compose %s</command> -- <icon-name>sylpheed</icon-name> -- <run-in-terminal>false</run-in-terminal> -- </mail-reader> -- <mail-reader> -- <_name>Sylpheed</_name> -- <executable>sylpheed</executable> -- <command>sylpheed --compose %s</command> -- <icon-name>sylpheed</icon-name> -- <run-in-terminal>false</run-in-terminal> -- </mail-reader> -- </mail-readers> -- - <terminals> - <terminal> - <_name>Debian Terminal Emulator</_name> diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler2.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler2.patch deleted file mode 100644 index 046e8a1d4613..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler2.patch +++ /dev/null @@ -1,56 +0,0 @@ - -++ gnome-control-center-2.32.1/debian/patches/141_set_default_internet_apps.patch - -Description: When starting up, read current web and mail values -Author: Michael Terry <michael.terry@canonical.com> -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=638771 - -Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c -=================================================================== ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.c 2011-01-05 15:02:37.406338902 -0500 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c 2011-01-05 15:02:44.836276440 -0500 -@@ -111,6 +111,34 @@ - } - - static void -+set_combo_to_default_for_scheme (GtkComboBox *combo, GList *handlers, const gchar *scheme) -+{ -+ GAppInfo *type_default; -+ GList *l; -+ int index; -+ -+ type_default = g_app_info_get_default_for_uri_scheme (scheme); -+ index = 0; -+ -+ if (type_default == NULL) -+ return; -+ -+ for (l = handlers; l != NULL; l = l->next) { -+ GnomeDAURLItem *handler = l->data; -+ if (g_app_info_equal(handler->app_info, type_default)) { -+ break; -+ } -+ ++index; -+ } -+ -+ if (l != NULL) { -+ gtk_combo_box_set_active (combo, index); -+ } -+ -+ g_object_unref (type_default); -+} -+ -+static void - media_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet) - { - guint current_index; -@@ -507,6 +535,9 @@ - fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats, TRUE); - fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats, TRUE); - -+ set_combo_to_default_for_scheme (GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, "http"); -+ set_combo_to_default_for_scheme (GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, "mailto"); -+ - g_signal_connect (capplet->web_combo_box, "changed", G_CALLBACK (web_combo_changed_cb), capplet); - g_signal_connect (capplet->mail_combo_box, "changed", G_CALLBACK (mail_combo_changed_cb), capplet); - g_signal_connect (capplet->term_combo_box, "changed", G_CALLBACK (terminal_combo_changed_cb), capplet); diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler3.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler3.patch deleted file mode 100644 index 8c9976c7bced..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler3.patch +++ /dev/null @@ -1,290 +0,0 @@ - -++ gnome-control-center-2.32.1/debian/patches/142_fix_icons_for_default_apps.patch - -Description: Fix icons for new glib url handlers -Author: Michael Terry <michael.terry@canonical.com> -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=638775 - -Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c -=================================================================== ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.c 2011-01-05 16:05:40.623854462 -0500 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c 2011-01-05 16:12:03.030460004 -0500 -@@ -35,7 +35,7 @@ - - enum - { -- PIXBUF_COL, -+ ICON_COL, - TEXT_COL, - N_COLUMNS - }; -@@ -193,33 +193,6 @@ - gtk_widget_set_sensitive (capplet->mobility_command_label, is_custom_active); - } - --static void --refresh_combo_box_icons (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list) --{ -- GList *entry; -- GnomeDAItem *item; -- GtkTreeModel *model; -- GtkTreeIter iter; -- GdkPixbuf *pixbuf; -- -- for (entry = app_list; entry != NULL; entry = g_list_next (entry)) { -- item = (GnomeDAItem *) entry->data; -- -- model = gtk_combo_box_get_model (combo_box); -- -- if (item->icon_path && gtk_tree_model_get_iter_from_string (model, &iter, item->icon_path)) { -- pixbuf = gtk_icon_theme_load_icon (theme, item->icon_name, 22, 0, NULL); -- -- gtk_list_store_set (GTK_LIST_STORE (model), &iter, -- PIXBUF_COL, pixbuf, -- -1); -- -- if (pixbuf) -- g_object_unref (pixbuf); -- } -- } --} -- - static struct { - const gchar *name; - const gchar *icon; -@@ -246,13 +219,6 @@ - icon = gtk_builder_get_object (capplet->builder, icons[i].name); - set_icon (GTK_IMAGE (icon), theme, icons[i].icon); - } -- -- refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers); -- refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers); -- refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players); -- refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals); -- refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats); -- refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats); - } - - static void -@@ -397,33 +363,31 @@ - } - - static void --fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list, gboolean add_custom) -+fill_combo_box (GtkComboBox *combo_box, GList *app_list, gboolean add_custom) - { - GList *entry; - GtkTreeModel *model; - GtkCellRenderer *renderer; - GtkTreeIter iter; -- GdkPixbuf *pixbuf; -- -- if (theme == NULL) { -- theme = gtk_icon_theme_get_default (); -- } - - if (add_custom) { - gtk_combo_box_set_row_separator_func (combo_box, is_separator, - GINT_TO_POINTER (g_list_length (app_list)), NULL); - } - -- model = GTK_TREE_MODEL (gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING)); -+ model = GTK_TREE_MODEL (gtk_list_store_new (2, G_TYPE_ICON, G_TYPE_STRING)); - gtk_combo_box_set_model (combo_box, model); - - renderer = gtk_cell_renderer_pixbuf_new (); - - /* not all cells have a pixbuf, this prevents the combo box to shrink */ -- gtk_cell_renderer_set_fixed_size (renderer, -1, 22); -+ gtk_cell_renderer_set_fixed_size (renderer, -1, 24); -+ g_object_set (G_OBJECT (renderer), -+ "stock-size", GTK_ICON_SIZE_LARGE_TOOLBAR, -+ NULL); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, FALSE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer, -- "pixbuf", PIXBUF_COL, -+ "gicon", ICON_COL, - NULL); - - renderer = gtk_cell_renderer_text_new (); -@@ -436,18 +400,11 @@ - GnomeDAItem *item; - item = (GnomeDAItem *) entry->data; - -- pixbuf = gtk_icon_theme_load_icon (theme, item->icon_name, 22, 0, NULL); -- - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, -- PIXBUF_COL, pixbuf, -+ ICON_COL, item->icon, - TEXT_COL, item->name, - -1); -- -- item->icon_path = gtk_tree_model_get_string_from_iter (model, &iter); -- -- if (pixbuf) -- g_object_unref (pixbuf); - } - - if (add_custom) { -@@ -455,7 +412,7 @@ - gtk_list_store_set (GTK_LIST_STORE (model), &iter, -1); - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, -- PIXBUF_COL, NULL, -+ ICON_COL, NULL, - TEXT_COL, _("Custom"), - -1); - } -@@ -528,12 +485,12 @@ - g_signal_connect (capplet->window, "screen-changed", G_CALLBACK (screen_changed_cb), capplet); - screen_changed_cb (capplet->window, gdk_screen_get_default (), capplet); - -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, FALSE); -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, FALSE); -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals, TRUE); -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players, TRUE); -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats, TRUE); -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats, TRUE); -+ fill_combo_box (GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, FALSE); -+ fill_combo_box (GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, FALSE); -+ fill_combo_box (GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals, TRUE); -+ fill_combo_box (GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players, TRUE); -+ fill_combo_box (GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats, TRUE); -+ fill_combo_box (GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats, TRUE); - - set_combo_to_default_for_scheme (GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, "http"); - set_combo_to_default_for_scheme (GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, "mailto"); -Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.c -=================================================================== ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-item.c 2011-01-05 16:04:48.644316418 -0500 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.c 2011-01-05 16:05:40.653854197 -0500 -@@ -79,8 +79,8 @@ - g_free (item->generic.name); - g_free (item->generic.executable); - g_free (item->generic.command); -- g_free (item->generic.icon_name); -- g_free (item->generic.icon_path); -+ if (item->generic.icon) -+ g_object_unref (item->generic.icon); - - g_object_unref (item->app_info); - -@@ -95,8 +95,8 @@ - g_free (item->generic.name); - g_free (item->generic.executable); - g_free (item->generic.command); -- g_free (item->generic.icon_name); -- g_free (item->generic.icon_path); -+ if (item->generic.icon) -+ g_object_unref (item->generic.icon); - - g_free (item); - } -@@ -109,8 +109,8 @@ - g_free (item->generic.name); - g_free (item->generic.executable); - g_free (item->generic.command); -- g_free (item->generic.icon_name); -- g_free (item->generic.icon_path); -+ if (item->generic.icon) -+ g_object_unref (item->generic.icon); - - g_free (item->exec_flag); - -@@ -125,8 +125,8 @@ - g_free (item->generic.name); - g_free (item->generic.executable); - g_free (item->generic.command); -- g_free (item->generic.icon_name); -- g_free (item->generic.icon_path); -+ if (item->generic.icon) -+ g_object_unref (item->generic.icon); - - g_free (item); - } -@@ -139,8 +139,8 @@ - g_free (item->generic.name); - g_free (item->generic.executable); - g_free (item->generic.command); -- g_free (item->generic.icon_name); -- g_free (item->generic.icon_path); -+ if (item->generic.icon) -+ g_object_unref (item->generic.icon); - - g_free (item); - } -Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.h -=================================================================== ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-item.h 2011-01-05 16:04:48.684316062 -0500 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.h 2011-01-05 16:05:40.653854197 -0500 -@@ -35,8 +35,7 @@ - gchar *name; - gchar *executable; - gchar *command; -- gchar *icon_name; -- gchar *icon_path; -+ GIcon *icon; - }; - - struct _GnomeDASimpleItem { -Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-xml.c -=================================================================== ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-xml.c 2011-01-05 16:04:48.624316596 -0500 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-xml.c 2011-01-05 16:05:40.653854197 -0500 -@@ -152,7 +152,7 @@ - term_item->generic.name = gnome_da_xml_get_string (element, "name"); - term_item->generic.executable = executable; - term_item->generic.command = gnome_da_xml_get_string (element, "command"); -- term_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name"); -+ term_item->generic.icon = g_themed_icon_new (gnome_da_xml_get_string (element, "icon-name")); - - term_item->exec_flag = gnome_da_xml_get_string (element, "exec-flag"); - -@@ -173,7 +173,7 @@ - media_item->generic.name = gnome_da_xml_get_string (element, "name"); - media_item->generic.executable = executable; - media_item->generic.command = gnome_da_xml_get_string (element, "command"); -- media_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name"); -+ media_item->generic.icon = g_themed_icon_new (gnome_da_xml_get_string (element, "icon-name")); - - media_item->run_in_terminal = gnome_da_xml_get_bool (element, "run-in-terminal"); - -@@ -194,7 +194,7 @@ - visual_item->generic.name = gnome_da_xml_get_string (element, "name"); - visual_item->generic.executable = executable; - visual_item->generic.command = gnome_da_xml_get_string (element, "command"); -- visual_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name"); -+ visual_item->generic.icon = g_themed_icon_new (gnome_da_xml_get_string (element, "icon-name")); - - visual_item->run_at_startup = gnome_da_xml_get_bool (element, "run-at-startup"); - -@@ -215,7 +215,7 @@ - mobility_item->generic.name = gnome_da_xml_get_string (element, "name"); - mobility_item->generic.executable = executable; - mobility_item->generic.command = gnome_da_xml_get_string (element, "command"); -- mobility_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name"); -+ mobility_item->generic.icon = g_themed_icon_new (gnome_da_xml_get_string (element, "icon-name")); - - mobility_item->run_at_startup = gnome_da_xml_get_bool (element, "run-at-startup"); - -@@ -246,12 +246,18 @@ - executable = g_app_info_get_executable (app_info); - if (is_executable_valid (executable)) { - GnomeDAURLItem *url_item; -+ GIcon *icon; - - url_item = gnome_da_url_item_new (); - url_item->generic.name = g_strdup (g_app_info_get_display_name (app_info)); - url_item->generic.executable = g_strdup (executable); - url_item->generic.command = g_strdup (g_app_info_get_commandline (app_info)); -- url_item->generic.icon_name = g_strdup (g_app_info_get_name (app_info)); -+ -+ icon = g_app_info_get_icon (app_info); -+ if (icon != NULL) { -+ url_item->generic.icon = g_object_ref (icon); -+ } -+ - /* Steal the reference */ - url_item->app_info = app_info; - diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch deleted file mode 100644 index 6662e0bd1242..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch +++ /dev/null @@ -1,383 +0,0 @@ -From a485992913ec84a4c558cad535dd8a2ab14b0c19 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Fri, 25 Apr 2014 22:17:24 +0200 -Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional - -Upstream is not interested in any part of this patch: - -https://bugzilla.gnome.org/show_bug.cgi?id=686840 -https://bugzilla.gnome.org/show_bug.cgi?id=697478 -https://bugzilla.gnome.org/show_bug.cgi?id=700145 - -Dropped mm from this revision of the patch since it appears more -complicated than ever to split it from the network panel. - -Signed-Off: Gilles Dartiguelongue <eva@gentoo.org> ---- - configure.ac | 146 ++++++++++++++++++++++++++------ - panels/Makefile.am | 10 ++- - panels/user-accounts/um-realm-manager.c | 9 ++ - shell/Makefile.am | 10 ++- - shell/cc-panel-loader.c | 8 ++ - 5 files changed, 153 insertions(+), 30 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 511f78d..f82108e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -139,14 +139,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11) - PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0) - PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0) --PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) -+ -+build_online_accounts=false -+AC_ARG_ENABLE(goa, -+ AC_HELP_STRING([--disable-goa], -+ [disable online accounts management panel]), -+ [case "${enableval}" in -+ yes) WANT_ONLINE_ACCOUNTS=yes ;; -+ no) WANT_ONLINE_ACCOUNTS=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;; -+ esac], -+ [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value -+ -+if test x$WANT_ONLINE_ACCOUNTS = xyes; then -+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) -+ build_online_accounts=true -+fi -+if test "x$build_online_accounts" = xtrue ; then -+ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel]) -+fi -+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue") -+AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS) -+AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS) -+ - PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION) --PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES -- colord >= $COLORD_REQUIRED_VERSION -- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION -- libsoup-2.4 -- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) -+ -+build_color=false -+AC_ARG_ENABLE(color, -+ AC_HELP_STRING([--disable-color], -+ [disable color management panel]), -+ [case "${enableval}" in -+ yes) WANT_COLOR=yes ;; -+ no) WANT_COLOR=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; -+ esac], -+ [WANT_COLOR=yes]) dnl Default value -+ -+if test x$WANT_COLOR = xyes; then -+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES -+ colord >= $COLORD_REQUIRED_VERSION -+ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION -+ libsoup-2.4 -+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) -+ build_color=true -+fi -+if test "x$build_color" = xtrue ; then -+ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel]) -+fi -+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") -+AC_SUBST(COLOR_PANEL_CFLAGS) -+AC_SUBST(COLOR_PANEL_LIBS) -+ - PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES - polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) - PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES) -@@ -206,8 +250,25 @@ fi - AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes]) - - # Check for gnome-bluetooth --PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.11.1, -- [have_bluetooth=yes], have_bluetooth=no) -+have_bluetooth=no -+AC_ARG_ENABLE(bluetooth, -+ AC_HELP_STRING([--disable-bluetooth], -+ [disable bluetooth management panel]), -+ [case "${enableval}" in -+ yes) WANT_BLUETOOTH=yes ;; -+ no) WANT_BLUETOOTH=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;; -+ esac], -+ [WANT_BLUETOOTH=yes]) dnl Default value -+ -+if test x$WANT_BLUETOOTH = xyes; then -+ # Check for gnome-bluetooth -+ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.11.1, -+ [have_bluetooth=yes], have_bluetooth=no) -+ have_bluetooth=yes -+fi -+ -+ - if test "x$have_bluetooth" = xyes ; then - AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel]) - fi -@@ -292,15 +353,27 @@ case $host_os in - if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then - have_wacom=no - else -- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES -- gnome-settings-daemon >= $GSD_REQUIRED_VERSION -- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION -- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION -- clutter-gtk-1.0 -- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) -- have_wacom=yes -- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) -- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) -+ AC_ARG_ENABLE(wacom, -+ AC_HELP_STRING([--disable-wacom], -+ [disable wacom management panel]), -+ [case "${enableval}" in -+ yes) WANT_WACOM=yes ;; -+ no) WANT_WACOM=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;; -+ esac], -+ [WANT_WACOM=yes]) dnl Default value -+ -+ if test x$WANT_WACOM = xyes; then -+ PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES -+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION -+ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION -+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION -+ clutter-gtk-1.0 -+ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) -+ have_wacom=yes -+ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) -+ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) -+ fi - fi - ;; - *) -@@ -310,16 +383,22 @@ esac - AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes]) - - # Kerberos kerberos support --AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) --if test "$KRB5_CONFIG" = "no"; then -- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) --fi -- --AC_MSG_CHECKING(for krb5 libraries and flags) --KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" --KRB5_LIBS="`$KRB5_CONFIG --libs`" --AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) -+AC_ARG_ENABLE([kerberos], -+ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),, -+ [enable_kerberos=yes]) -+ -+if test x"$enable_kerberos" != x"no" ; then -+ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) -+ if test "$KRB5_CONFIG" = "no"; then -+ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) -+ fi - -+ AC_MSG_CHECKING(for krb5 libraries and flags) -+ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" -+ KRB5_LIBS="`$KRB5_CONFIG --libs`" -+ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) -+ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available]) -+fi - AC_SUBST(KRB5_CFLAGS) - AC_SUBST(KRB5_LIBS) - -@@ -538,6 +617,11 @@ if test "x$have_bluetooth" = "xyes"; then - else - AC_MSG_NOTICE([ Bluetooth panel disabled]) - fi -+if test "x$build_color" = "xtrue"; then -+ AC_MSG_NOTICE([** colord (Color panel)]) -+else -+ AC_MSG_NOTICE([ Color panel disabled]) -+fi - if test "x$enable_cups" = "xyes"; then - AC_MSG_NOTICE([** CUPS (Printers panel)]) - else -@@ -548,6 +632,16 @@ if test "x$have_cheese" = "xyes"; then - else - AC_MSG_NOTICE([ Users panel webcam support disabled]) - fi -+if test "x$build_online_accounts" = "xtrue"; then -+ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)]) -+else -+ AC_MSG_NOTICE([ Online Accounts panel disabled]) -+fi -+if test "x$build_wacom" = "xtrue"; then -+ AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)]) -+else -+ AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled]) -+fi - if test "x$have_wacom" = "xyes"; then - AC_MSG_NOTICE([** wacom (Wacom tablet panel)]) - else -diff --git a/panels/Makefile.am b/panels/Makefile.am -index 9961c25..0c54622 100644 ---- a/panels/Makefile.am -+++ b/panels/Makefile.am -@@ -2,11 +2,9 @@ SUBDIRS= \ - common \ - background \ - power \ -- color \ - display \ - mouse \ - notifications \ -- online-accounts \ - region \ - info \ - sound \ -@@ -18,6 +16,10 @@ SUBDIRS= \ - privacy \ - sharing - -+if BUILD_COLOR -+SUBDIRS += color -+endif -+ - if BUILD_WACOM - SUBDIRS += wacom - endif -@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH - SUBDIRS += bluetooth - endif - -+if BUILD_ONLINE_ACCOUNTS -+SUBDIRS += online-accounts -+endif -+ - -include $(top_srcdir)/git.mk -diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c -index 0849160..58d50a6 100644 ---- a/panels/user-accounts/um-realm-manager.c -+++ b/panels/user-accounts/um-realm-manager.c -@@ -22,7 +22,9 @@ - - #include "um-realm-manager.h" - -+#ifdef HAVE_KERBEROS - #include <krb5/krb5.h> -+#endif - - #include <glib.h> - #include <glib/gi18n.h> -@@ -696,6 +698,7 @@ login_closure_free (gpointer data) - g_slice_free (LoginClosure, login); - } - -+#ifdef HAVE_KERBEROS - static krb5_error_code - login_perform_kinit (krb5_context k5, - const gchar *realm, -@@ -759,12 +762,14 @@ login_perform_kinit (krb5_context k5, - - return code; - } -+#endif /* HAVE_KERBEROS */ - - static void - kinit_thread_func (GSimpleAsyncResult *async, - GObject *object, - GCancellable *cancellable) - { -+#ifdef HAVE_KERBEROS - LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async); - krb5_context k5 = NULL; - krb5_error_code code; -@@ -842,6 +847,10 @@ kinit_thread_func (GSimpleAsyncResult *async, - - if (k5) - krb5_free_context (k5); -+#else /* HAVE_KERBEROS */ -+ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC, -+ _("gnome-control-center was built without kerberos support")); -+#endif - } - - void -diff --git a/shell/Makefile.am b/shell/Makefile.am -index ad7a68f..cc968ac 100644 ---- a/shell/Makefile.am -+++ b/shell/Makefile.am -@@ -52,14 +52,12 @@ gnome_control_center_LDADD = \ - $(top_builddir)/libgd/libgd.la \ - $(top_builddir)/panels/common/liblanguage.la \ - $(top_builddir)/panels/background/libbackground.la \ -- $(top_builddir)/panels/color/libcolor.la \ - $(top_builddir)/panels/datetime/libdate_time.la \ - $(top_builddir)/panels/display/libdisplay.la \ - $(top_builddir)/panels/info/libinfo.la \ - $(top_builddir)/panels/keyboard/libkeyboard.la \ - $(top_builddir)/panels/mouse/libmouse-properties.la \ - $(top_builddir)/panels/notifications/libnotifications.la \ -- $(top_builddir)/panels/online-accounts/libonline-accounts.la \ - $(top_builddir)/panels/power/libpower.la \ - $(top_builddir)/panels/privacy/libprivacy.la \ - $(top_builddir)/panels/region/libregion.la \ -@@ -85,6 +83,14 @@ if BUILD_BLUETOOTH - gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la - endif - -+if BUILD_COLOR -+gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la -+endif -+ -+if BUILD_ONLINE_ACCOUNTS -+gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la -+endif -+ - AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\"" - - # Dbus service file -diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c -index 26576dc..8a92f95 100644 ---- a/shell/cc-panel-loader.c -+++ b/shell/cc-panel-loader.c -@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void); - #ifdef BUILD_BLUETOOTH - extern GType cc_bluetooth_panel_get_type (void); - #endif /* BUILD_BLUETOOTH */ -+#ifdef BUILD_COLOR - extern GType cc_color_panel_get_type (void); -+#endif /* BUILD_COLOR */ - extern GType cc_date_time_panel_get_type (void); - extern GType cc_display_panel_get_type (void); - extern GType cc_info_panel_get_type (void); -@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void); - extern GType cc_network_panel_get_type (void); - #endif /* BUILD_NETWORK */ - extern GType cc_notifications_panel_get_type (void); -+#ifdef BUILD_ONLINE_ACCOUNTS - extern GType cc_goa_panel_get_type (void); -+#endif /* BUILD_ONLINE_ACCOUNTS */ - extern GType cc_power_panel_get_type (void); - #ifdef BUILD_PRINTERS - extern GType cc_printers_panel_get_type (void); -@@ -77,7 +81,9 @@ static struct { - #ifdef BUILD_BLUETOOTH - PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ), - #endif -+#ifdef BUILD_COLOR - PANEL_TYPE("color", cc_color_panel_get_type ), -+#endif - PANEL_TYPE("datetime", cc_date_time_panel_get_type ), - PANEL_TYPE("display", cc_display_panel_get_type ), - PANEL_TYPE("info", cc_info_panel_get_type ), -@@ -87,7 +93,9 @@ static struct { - PANEL_TYPE("network", cc_network_panel_get_type ), - #endif - PANEL_TYPE("notifications", cc_notifications_panel_get_type), -+#ifdef BUILD_ONLINE_ACCOUNTS - PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), -+#endif - PANEL_TYPE("power", cc_power_panel_get_type ), - #ifdef BUILD_PRINTERS - PANEL_TYPE("printers", cc_printers_panel_get_type ), --- -1.9.0 - diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.32.1-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.32.1-r1.ebuild deleted file mode 100644 index 94a3c94d072b..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-2.32.1-r1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.32.1-r1.ebuild,v 1.9 2014/01/05 07:39:55 tetromino Exp $ - -EAPI="3" -GCONF_DEBUG="yes" - -inherit autotools gnome2 eutils - -DESCRIPTION="The gnome2 Desktop configuration tool" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="eds" - -# TODO: appindicator -# libgnomekbd-2.91 breaks API/ABI -RDEPEND="x11-libs/libXft - >=x11-libs/libXi-1.2 - >=x11-libs/gtk+-2.20:2 - >=dev-libs/glib-2.28:2 - >=gnome-base/gconf-2.0:2 - >=gnome-base/librsvg-2.0:2 - >=gnome-base/nautilus-2.6 - >=media-libs/fontconfig-1 - >=dev-libs/dbus-glib-0.73 - >=x11-libs/libxklavier-4.0 - >=x11-wm/metacity-2.23.1 - >=gnome-base/libgnomekbd-2.31.2 - <gnome-base/libgnomekbd-2.91.0 - >=gnome-base/gnome-desktop-2.29.4:2 - >=gnome-base/gnome-menus-2.11.1:0 - gnome-base/gnome-settings-daemon - - dev-libs/libunique:1 - x11-libs/pango - dev-libs/libxml2 - media-libs/freetype - media-libs/libcanberra[gtk] - - eds? ( >=gnome-extra/evolution-data-server-1.7.90 ) - - x11-apps/xmodmap - x11-libs/libXScrnSaver - x11-libs/libXext - x11-libs/libX11 - x11-libs/libXxf86misc - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXcursor" -DEPEND="${RDEPEND} - x11-proto/scrnsaverproto - x11-proto/xextproto - x11-proto/xproto - x11-proto/xf86miscproto - x11-proto/kbproto - x11-proto/randrproto - x11-proto/renderproto - - sys-devel/gettext - >=dev-util/intltool-0.40 - virtual/pkgconfig - dev-util/desktop-file-utils - - app-text/scrollkeeper - >=app-text/gnome-doc-utils-0.10.1" -# Needed for autoreconf -# gnome-base/gnome-common - -pkg_setup() { - G2CONF="${G2CONF} - --disable-update-mimedb - --disable-static - --disable-appindicator - $(use_enable eds aboutme)" - DOCS="AUTHORS ChangeLog NEWS README TODO" -} - -src_prepare() { - # Use URL handlers for browser and mailer applications - epatch "${FILESDIR}/${P}-mime-handler.patch" - - # When starting up, read current web and mail values - epatch "${FILESDIR}/${P}-mime-handler2.patch" - - # Fix icons for new glib url handlers - epatch "${FILESDIR}/${P}-mime-handler3.patch" - - # Do not show twice the configured background if it is a symlink to a known background - epatch "${FILESDIR}/${P}-duplicated-background.patch" - - # Don't erase backgounds.xml, bug #344335 - epatch "${FILESDIR}/${P}-erase-background.patch" - - # Fix underlinking failure, bug #497112 - epatch "${FILESDIR}/${P}-gmodule.patch" - - rm missing || die # old missing script causes autoreconf warnings - eautoreconf - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - # gmodule is used to load plugins - # (on POSIX systems gmodule uses dlopen) - prune_libtool_files --modules -} |