rpms/control-center/devel control-center-2.21.92-passwd.patch, NONE, 1.1 gnome-control-center-2.21.92-gecos.patch, NONE, 1.1 .cvsignore, 1.69, 1.70 control-center.spec, 1.341, 1.342 default-applications.patch, 1.2, 1.3 sources, 1.72, 1.73

Matthias Clasen (mclasen) fedora-extras-commits at redhat.com
Tue Feb 26 17:26:40 UTC 2008 

Author: mclasen

Update of /cvs/extras/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32249

Modified Files:
	.cvsignore control-center.spec default-applications.patch 
	sources 
Added Files:
	control-center-2.21.92-passwd.patch 
	gnome-control-center-2.21.92-gecos.patch 
Log Message:
update patches


control-center-2.21.92-passwd.patch:

--- NEW FILE control-center-2.21.92-passwd.patch ---
diff -up gnome-control-center-2.21.92/capplets/about-me/gnome-about-me.c.passwd gnome-control-center-2.21.92/capplets/about-me/gnome-about-me.c
--- gnome-control-center-2.21.92/capplets/about-me/gnome-about-me.c.passwd	2008-02-26 04:16:37.000000000 -0500
+++ gnome-control-center-2.21.92/capplets/about-me/gnome-about-me.c	2008-02-26 12:14:00.000000000 -0500
@@ -35,7 +35,6 @@
 #include <libebook/e-book.h>
 
 #include "e-image-chooser.h"
-#include "gnome-about-me-password.h"
 
 #include "capplet-util.h"
 
@@ -793,10 +792,11 @@ about_me_button_clicked_cb (GtkDialog *d
 static void
 about_me_passwd_clicked_cb (GtkWidget *button, GnomeAboutMe *me)
 {
-	GladeXML *dialog;
+	gchar *argv[2]; 
 
-	dialog = me->dialog;
-	gnome_about_me_password (GTK_WINDOW (WID ("about-me-dialog")));
+	argv[0] = "/usr/bin/userpasswd";
+	argv[1] = NULL;
+	g_spawn_async (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL);
 }
 
 static gint
@@ -808,10 +808,7 @@ about_me_setup_dialog (void)
 	GladeXML     *dialog;
 	GError 	     *error = NULL;
 	GList        *chain;
-
-	struct passwd *pwent;
-	gchar *str;
-	gchar **tok;
+	gchar        *str;
 
 	me = g_new0 (GnomeAboutMe, 1);
 
@@ -880,34 +877,14 @@ about_me_setup_dialog (void)
 		about_me_setup_email (me->contact);
 	}
 
-	/************************************************/
-	me->login = get_user_login ();
-	setpwent ();
-	pwent = getpwnam (me->login);
-	if (pwent == NULL) {
-		about_me_error (GTK_WINDOW (WID ("about-me-dialog")),
-				_("Unknown login ID, the user database might be corrupted"));
-		about_me_destroy (me);
-		return -1;
-	}
-	tok = g_strsplit (pwent->pw_gecos, ",", 0);
-
-	/************************************************/
-
-	if (tok[0] == NULL || strlen (tok[0]) == 0)
-		me->username = NULL;
-	else
-		me->username = g_strdup (tok[0]);
+	me->login = g_strdup (g_get_user_name ());
+	me->username = g_strdup (g_get_real_name ());
 
 	/* Contact Tab */
 	about_me_load_photo (me, me->contact);
 
 	widget = WID ("fullname");
-	if (tok[0] == NULL || strlen (tok[0]) == 0) {
-		str = g_strdup_printf ("<b><span size=\"xx-large\">%s</span></b>", me->login);
-	} else {
-		str = g_strdup_printf ("<b><span size=\"xx-large\">%s</span></b>", tok[0]);
-	}
+	str = g_strdup_printf ("<b><span size=\"xx-large\">%s</span></b>", me->username);
 
 	gtk_label_set_markup (GTK_LABEL (widget), str);
 	g_free (str);
@@ -915,14 +892,9 @@ about_me_setup_dialog (void)
 	widget = WID ("login");
 	gtk_label_set_text (GTK_LABEL (widget), me->login);
 
-	if (tok[0] == NULL || strlen (tok[0]) == 0) {
-		str = g_strdup_printf (_("About %s"), me->login);
-	} else {
-		str = g_strdup_printf (_("About %s"), tok[0]);
-	}
+        str = g_strdup_printf (_("About %s"), me->username);
 	gtk_window_set_title (GTK_WINDOW (main_dialog), str);
 	g_free (str);
-	g_strfreev (tok);
 
 	widget = WID ("password");
 	g_signal_connect (G_OBJECT (widget), "clicked",

gnome-control-center-2.21.92-gecos.patch:

--- NEW FILE gnome-control-center-2.21.92-gecos.patch ---
diff -up gnome-control-center-2.21.92/capplets/about-me/gnome-about-me.glade.gecos gnome-control-center-2.21.92/capplets/about-me/gnome-about-me.glade
--- gnome-control-center-2.21.92/capplets/about-me/gnome-about-me.glade.gecos	2008-02-26 04:16:37.000000000 -0500
+++ gnome-control-center-2.21.92/capplets/about-me/gnome-about-me.glade	2008-02-26 12:15:32.000000000 -0500
@@ -101,23 +101,30 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkLabel" id="fullname">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Full Name</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
+                    <widget class="GtkButton" id="fullnamebox">
+                      <property name="relief">GTK_RELIEF_NONE</property>
+                      <property name="focus_on_click">True</property>
+ 
+                      <child>
+                        <widget class="GtkLabel" id="fullname">
+                          <property name="visible">True</property>
+                          <property name="label" translatable="yes">Full Name</property>
+                          <property name="use_underline">False</property>
+                          <property name="use_markup">False</property>
+                          <property name="justify">GTK_JUSTIFY_LEFT</property>
+                          <property name="wrap">False</property>
+                          <property name="selectable">False</property>
+                          <property name="xalign">0</property>
+                          <property name="yalign">0.5</property>
+                          <property name="xpad">0</property>
+                          <property name="ypad">0</property>
+                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                          <property name="width_chars">-1</property>
+                          <property name="single_line_mode">False</property>
+                          <property name="angle">0</property>
+                        </widget>
+                      </child>
+                    </widget>
 		    <packing>
 		      <property name="padding">0</property>
 		      <property name="expand">False</property>
diff -up gnome-control-center-2.21.92/capplets/about-me/Makefile.am.gecos gnome-control-center-2.21.92/capplets/about-me/Makefile.am
--- gnome-control-center-2.21.92/capplets/about-me/Makefile.am.gecos	2008-02-24 18:36:53.000000000 -0500
+++ gnome-control-center-2.21.92/capplets/about-me/Makefile.am	2008-02-26 12:15:32.000000000 -0500
@@ -9,9 +9,6 @@ pixmap_files = 				\
 	gnome-about-me-lock-open.png
 
 gnome_about_me_SOURCES =	 	\
-	eel-alert-dialog.c		\
-	eel-alert-dialog.h		\
-	eel-gtk-macros.h		\
 	gnome-about-me-password.c	\
 	gnome-about-me-password.h	\
 	e-image-chooser.c		\
@@ -24,7 +21,7 @@ bin_PROGRAMS = gnome-about-me
 pixmapdir = $(pkgdatadir)/pixmaps
 pixmap_DATA = $(pixmap_files)
 
-gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS)
+gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(EEL_LIBS)
 gnome_about_me_LDFLAGS = -export-dynamic
 
 @INTLTOOL_DESKTOP_RULE@
@@ -38,6 +35,7 @@ glade_DATA = $(glade_files)
 INCLUDES = \
 	$(GNOMECC_CAPPLETS_CFLAGS) \
 	$(LIBEBOOK_CFLAGS) \
+	$(EEL_CFLAGS) \
 	-DDATADIR="\"$(datadir)\"" \
 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
 	-DGNOMECC_GLADE_DIR="\"$(gladedir)\"" \
diff -up gnome-control-center-2.21.92/capplets/about-me/gnome-about-me.c.gecos gnome-control-center-2.21.92/capplets/about-me/gnome-about-me.c
--- gnome-control-center-2.21.92/capplets/about-me/gnome-about-me.c.gecos	2008-02-26 12:15:32.000000000 -0500
+++ gnome-control-center-2.21.92/capplets/about-me/gnome-about-me.c	2008-02-26 12:18:44.000000000 -0500
@@ -35,6 +35,7 @@
 #include <libebook/e-book.h>
 
 #include "e-image-chooser.h"
+#include <eel/eel-editable-label.h>
 
 #include "capplet-util.h"
 
@@ -57,6 +58,7 @@ typedef struct {
 	gboolean      	 have_image;
 	gboolean      	 image_changed;
 	gboolean      	 create_self;
+        gboolean         editing_username;
 
 	gchar        	*person;
 	gchar 		*login;
@@ -135,7 +137,7 @@ struct WidToCid ids[] = {
 #define ATTRIBUTE_WORK "WORK"
 
 static void about_me_set_address_field (EContactAddress *, guint, gchar *);
-
+static gchar *about_me_get_address_field (EContactAddress *, guint);
 
 /*** Utility functions ***/
 static void
@@ -218,6 +220,50 @@ about_me_commit (GnomeAboutMe *me)
 	me->create_self = FALSE;
 }
 
+static void
+update_gecos (GnomeAboutMe *me)
+{
+	const gchar *argv[12];
+	gint i = 0;
+	const gchar *fullname;
+	const gchar *office;
+	const gchar *office_phone;
+	const gchar *home_phone;
+
+	argv[i++] = "/usr/bin/userinfo";
+
+	fullname = e_contact_get_const (me->contact, E_CONTACT_FULL_NAME);
+	office = about_me_get_address_field (me->addr2, ADDRESS_LOCALITY);
+	office_phone = e_contact_get_const (me->contact, E_CONTACT_PHONE_BUSINESS);
+	home_phone = e_contact_get_const (me->contact, E_CONTACT_PHONE_HOME);
+
+	if (fullname) {
+		argv[i++] = "-f";
+		argv[i++] = fullname;
+	}
+ 
+	if (office) {
+		argv[i++] = "-o";
+		argv[i++] = office;
+	}
+ 
+	if (office_phone) {
+		argv[i++] = "-p";
+		argv[i++] = office_phone;
+	}
+
+	if (home_phone) {
+		argv[i++] = "-h";
+		argv[i++] = home_phone;
+	}
+
+	argv[i++] = "-x";
+	argv[i++] = NULL;
+
+	g_spawn_sync (NULL, (gchar **)argv, NULL, 0,
+		      NULL, NULL, NULL, NULL, NULL, NULL);
+}
+
 static gboolean
 about_me_commit_from_timeout (GnomeAboutMe *me)
 {
@@ -284,22 +330,6 @@ about_me_focus_out (GtkWidget *widget, G
 	return FALSE;
 }
 
-static char *
-get_user_login (void)
-{
-	char buf[LINE_MAX * 4];
-	struct passwd pwd, *err;
-
-	int i;
-#if __sun
-	i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf));
-	return (i != 0) ? g_strdup (pwd.pw_name) : NULL;
-#else
-	i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf), &err);
-	return ((i == 0) && (err == &pwd)) ? g_strdup (pwd.pw_name) : NULL;
-#endif
-}
-
 /*
  * Helpers
  */
@@ -783,6 +813,8 @@ about_me_button_clicked_cb (GtkDialog *d
 			g_source_remove (me->commit_timeout_id);
 			about_me_commit (me);
 		}
+                 
+                update_gecos (me);
 
 		about_me_destroy (me);
 		gtk_main_quit ();
@@ -799,6 +831,144 @@ about_me_passwd_clicked_cb (GtkWidget *b
 	g_spawn_async (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL);
 }
 
+static GtkWidget *
+find_fullname_editable_label (GnomeAboutMe *me)
+{
+	GtkWidget    *widget;
+	GList        *list;
+	GtkWidget    *c;
+	GladeXML     *dialog;
+
+	dialog = me->dialog;
+
+	widget = WID ("fullnamebox");
+
+	list = gtk_container_get_children (GTK_CONTAINER (widget->parent));
+
+	while (list) {
+		c = list->data;
+
+		if (EEL_IS_EDITABLE_LABEL (c))
+			break;
+
+		c = NULL;
+
+		list = list->next;
+	}
+
+	g_list_free (list);
+
+	return c;
+}
+
+static void
+about_me_button_clicked (GtkWidget      *button,
+			 GnomeAboutMe   *me)
+{
+	GtkWidget    *label;
+	GtkWidget    *entry;
+	PangoFontDescription *font;
+	gint size;
+	const gchar *text;
+
+	label = gtk_bin_get_child (GTK_BIN (button));
+	entry = find_fullname_editable_label (me);
+
+	font = pango_font_description_copy (label->style->font_desc);
+	size = pango_font_description_get_size (font);
+	if (size == 0)
+		size = 10;
+	pango_font_description_set_size (font, size * PANGO_SCALE_XX_LARGE);
+	pango_font_description_set_weight (font, PANGO_WEIGHT_BOLD);
+
+	eel_editable_label_set_font_description (EEL_EDITABLE_LABEL (entry), font);
+	pango_font_description_free (font);
+
+	gtk_misc_set_alignment (GTK_MISC (entry), 0.0, 0.5);
+
+	me->editing_username = TRUE;
+
+	text = gtk_label_get_text (GTK_LABEL (label));
+	eel_editable_label_set_text (EEL_EDITABLE_LABEL (entry), text);
+
+	gtk_widget_hide (button);
+	gtk_widget_show (entry);
+	gtk_widget_grab_focus (entry);
+}
+
+static void 
+stop_editing (GnomeAboutMe *me, gboolean commit)
+{
+	GtkWidget   *button;
+	GtkWidget   *label;
+	GtkWidget   *entry;
+	GtkWidget   *main_dialog;
+	const gchar *text;
+	gchar *str;
+	GladeXML     *dialog;
+
+	if (!me->editing_username)
+		return;
+
+	me->editing_username = FALSE;
+
+	dialog = me->dialog;
+
+	button = WID ("fullnamebox");
+	label = gtk_bin_get_child (GTK_BIN (button));
+	entry = find_fullname_editable_label (me);
+
+	if (commit) {
+		text = eel_editable_label_get_text (EEL_EDITABLE_LABEL (entry));
+		str = g_strdup_printf ("<b><span size=\"xx-large\">%s</span></b>", text);
+		gtk_label_set_markup (GTK_LABEL (label), str);
+		g_free (str);
+
+		g_free (me->username);
+		me->username = g_strdup (text);
+		e_contact_set (me->contact, E_CONTACT_FULL_NAME, me->username);
+
+		main_dialog = WID ("about-me-dialog");
+		str = g_strdup_printf (_("About %s"), me->username);
+		gtk_window_set_title (GTK_WINDOW (main_dialog), str);
+		g_free (str);
+	}
+
+	gtk_widget_hide (entry);
+	gtk_widget_show (button);
+}
+
+static gboolean
+about_me_entry_focus_out (GtkWidget     *entry,
+			  GdkEventFocus *event,
+			  GnomeAboutMe  *me)
+{
+	stop_editing (me, TRUE);
+
+	return FALSE;
+}
+
+static gboolean
+about_me_entry_key_press (GtkWidget    *entry,
+			  GdkEventKey  *event,
+			  GnomeAboutMe *me)
+{
+	switch (event->keyval)
+	{
+	case GDK_Return:
+	case GDK_KP_Enter:
+		stop_editing (me, TRUE);
+		return TRUE;
+	case GDK_Escape:
+		stop_editing (me, FALSE);
+		return TRUE;
+	default:
+		break;
+	}
+
+	return FALSE;
+}
+
 static gint
 about_me_setup_dialog (void)
 {
@@ -809,6 +979,8 @@ about_me_setup_dialog (void)
 	GError 	     *error = NULL;
 	GList        *chain;
 	gchar        *str;
+	GtkWidget    *entry;
+	GtkWidget    *button;
 
 	me = g_new0 (GnomeAboutMe, 1);
 
@@ -889,6 +1061,25 @@ about_me_setup_dialog (void)
 	gtk_label_set_markup (GTK_LABEL (widget), str);
 	g_free (str);
 
+       button = WID ("fullnamebox");
+       g_signal_connect (button, "clicked",
+                         G_CALLBACK (about_me_button_clicked), me);
+
+       entry = eel_editable_label_new (me->username);
+       eel_editable_label_set_line_wrap (EEL_EDITABLE_LABEL (entry), TRUE);
+        gtk_container_add (GTK_CONTAINER (button->parent), entry);
+       gtk_box_reorder_child (GTK_BOX (button->parent), entry, 3);
+       g_signal_connect (entry, "focus-out-event",
+                         G_CALLBACK (about_me_entry_focus_out), me);
+       g_signal_connect (entry, "key-press-event",
+                         G_CALLBACK (about_me_entry_key_press), me);
+
+       gtk_widget_set_no_show_all (button, TRUE);
+       gtk_widget_set_no_show_all (entry, TRUE);
+       gtk_widget_show (widget);
+       gtk_widget_show (button);
+       gtk_widget_hide (entry);
+
 	widget = WID ("login");
 	gtk_label_set_text (GTK_LABEL (widget), me->login);
 
diff -up gnome-control-center-2.21.92/configure.in.gecos gnome-control-center-2.21.92/configure.in
--- gnome-control-center-2.21.92/configure.in.gecos	2008-02-26 12:15:32.000000000 -0500
+++ gnome-control-center-2.21.92/configure.in	2008-02-26 12:15:32.000000000 -0500
@@ -251,6 +251,7 @@ if test x$enable_vfs_methods = xyes; the
     FONT_THUMBNAILER_LIBS=`echo $FONT_THUMBNAILER_LIBS | sed -e "s/$export_dynamic//"`
     FONT_METHOD_LIBS=`echo $FONT_METHOD_LIBS | sed -e "s/$export_dynamic//"`
   fi
+  PKG_CHECK_MODULES(EEL, eel-2.0)
 fi
 
 dnl ==============================================


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	29 Jan 2008 15:11:49 -0000	1.69
+++ .cvsignore	26 Feb 2008 17:25:42 -0000	1.70
@@ -1 +1 @@
-gnome-control-center-2.21.90.tar.bz2
+gnome-control-center-2.21.92.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- control-center.spec	16 Feb 2008 01:45:46 -0000	1.341
+++ control-center.spec	26 Feb 2008 17:25:42 -0000	1.342
@@ -21,8 +21,8 @@
 
 Summary: GNOME Control Center
 Name: control-center
-Version: 2.21.90
-Release: 10%{?dist}
+Version: 2.21.92
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -35,11 +35,9 @@
 # Fix some useless warnings in libslab
 # http://bugzilla.gnome.org/show_bug.cgi?id=439398
 Patch6: gnome-control-center-2.19.90-no-warnings.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=511306
-Patch7: no-fonts.patch
 # call the Fedora/RHEL graphical passwd changing apps
-Patch95: control-center-2.19.91-passwd.patch
-Patch96: control-center-2.19.90-gecos.patch
+Patch95: control-center-2.21.92-passwd.patch
+Patch96: gnome-control-center-2.21.92-gecos.patch
 # change default preferred apps to programs we ship
 Patch99: default-applications.patch
 
@@ -164,7 +162,6 @@
 pushd libslab
 %patch6 -p0 -b .warnings
 popd
-%patch7 -p1 -b .no-fonts
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -349,6 +346,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Tue Feb 26 2008 Matthias Clasen <mclasen at redhat.com> - 2.21.92-1
+- Update to 2.21.92
+
 * Wed Feb 13 2008 Soren Sandmann <sandmann at redhat.com> - 2.21.90-10
 - Update randr capplet
 

default-applications.patch:

Index: default-applications.patch
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/default-applications.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default-applications.patch	11 Jan 2008 11:20:49 -0000	1.2
+++ default-applications.patch	26 Feb 2008 17:25:42 -0000	1.3
@@ -1,7 +1,7 @@
-diff -up gnome-control-center-2.21.4/capplets/default-applications/gnome-default-applications.xml.in.default-apps gnome-control-center-2.21.4/capplets/default-applications/gnome-default-applications.xml.in
---- gnome-control-center-2.21.4/capplets/default-applications/gnome-default-applications.xml.in.default-apps	2007-12-20 17:00:56.000000000 -0500
-+++ gnome-control-center-2.21.4/capplets/default-applications/gnome-default-applications.xml.in	2007-12-21 12:23:29.000000000 -0500
-@@ -44,52 +44,12 @@
+diff -up gnome-control-center-2.21.92/capplets/default-applications/gnome-default-applications.xml.in.default-apps gnome-control-center-2.21.92/capplets/default-applications/gnome-default-applications.xml.in
+--- gnome-control-center-2.21.92/capplets/default-applications/gnome-default-applications.xml.in.default-apps	2008-02-24 18:36:53.000000000 -0500
++++ gnome-control-center-2.21.92/capplets/default-applications/gnome-default-applications.xml.in	2008-02-26 12:23:53.000000000 -0500
+@@ -44,62 +44,22 @@
        <win-command>galeon -w %s</win-command>
      </web-browser>
      <web-browser>
@@ -29,18 +29,19 @@
        <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>
++      <netscape-remote>false</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 -remote "openurl(%s,new-tab)"</tab-command>
--      <win-command>iceweasel -remote "openurl(%s,new-window)"</win-command>
+-      <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>
@@ -51,11 +52,10 @@
 -      <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>
-+      <netscape-remote>false</netscape-remote>
-     </web-browser>
-     <web-browser>
+-    </web-browser>
+-    <web-browser>
        <_name>Mozilla</_name>
-@@ -97,9 +57,7 @@
+       <executable>mozilla</executable>
        <command>mozilla %s</command>
        <icon-name>mozilla-icon</icon-name>
        <run-in-terminal>false</run-in-terminal>
@@ -66,7 +66,7 @@
      </web-browser>
      <web-browser>
        <_name>SeaMonkey</_name>
-@@ -112,24 +70,12 @@
+@@ -112,24 +72,12 @@
        <win-command>seamonkey -remote "openurl(%s,new-window)"</win-command>
      </web-browser>
      <web-browser>
@@ -93,7 +93,7 @@
      </web-browser>
      <web-browser>
        <_name>Konqueror</_name>
-@@ -153,7 +99,7 @@
+@@ -153,7 +101,7 @@
      <mail-reader>
        <_name>Evolution Mail Reader</_name>
        <executable>evolution</executable>
@@ -102,10 +102,17 @@
        <icon-name>evolution</icon-name>
        <run-in-terminal>false</run-in-terminal>
      </mail-reader>
-@@ -179,27 +125,13 @@
+@@ -172,34 +120,13 @@
        <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>
 +      <_name>Thunderbird Mail</_name>
        <executable>thunderbird</executable>
@@ -131,7 +138,21 @@
        <_name>SeaMonkey Mail</_name>
        <executable>seamonkey</executable>
        <command>seamonkey -mail %s</command>
-@@ -252,6 +191,20 @@
+@@ -207,13 +134,6 @@
+       <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>
+@@ -252,6 +172,20 @@
        <exec-flag>-e</exec-flag>
      </terminal>
      <terminal>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	29 Jan 2008 15:11:49 -0000	1.72
+++ sources	26 Feb 2008 17:25:42 -0000	1.73
@@ -1 +1 @@
-b6b747fa1bc6115f9bddd3546ead171b  gnome-control-center-2.21.90.tar.bz2
+90039cb743f080d03ffd06e46796f4c5  gnome-control-center-2.21.92.tar.bz2

More information about the fedora-extras-commits mailing list