gnome-control-center r9198 - in trunk: . capplets/network capplets/network/icons/16x16 capplets/network/icons/22x22 capplets/network/icons/24x24 capplets/network/icons/32x32 capplets/network/icons/48x48 capplets/network/icons/scalable

[lferrett svn gnome org]

Author: lferrett
Date: Tue Jan 13 14:32:37 2009
New Revision: 9198
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9198&view=rev

Log:
2009-01-13  Luca Ferretti  <elle uca libero it>

	* configure.in: 
	* capplets/network/*:
	Renamed from gnome-network-preferences to gnome-network-properties.
	Closes bug #554342



Added:
   trunk/capplets/network/gnome-network-properties.c   (contents, props changed)
      - copied, changed from r9197, /trunk/capplets/network/gnome-network-preferences.c
   trunk/capplets/network/gnome-network-properties.desktop.in.in   (contents, props changed)
      - copied, changed from r9197, /trunk/capplets/network/gnome-network-preferences.desktop.in.in
   trunk/capplets/network/gnome-network-properties.glade   (props changed)
      - copied unchanged from r9197, /trunk/capplets/network/gnome-network-preferences.glade
   trunk/capplets/network/icons/16x16/gnome-network-properties.png   (props changed)
      - copied unchanged from r9197, /trunk/capplets/network/icons/16x16/gnome-network-preferences.png
   trunk/capplets/network/icons/16x16/gnome-network-properties.svg   (props changed)
      - copied unchanged from r9197, /trunk/capplets/network/icons/16x16/gnome-network-preferences.svg
   trunk/capplets/network/icons/22x22/gnome-network-properties.png   (props changed)
      - copied unchanged from r9197, /trunk/capplets/network/icons/22x22/gnome-network-preferences.png
   trunk/capplets/network/icons/22x22/gnome-network-properties.svg   (props changed)
      - copied unchanged from r9197, /trunk/capplets/network/icons/22x22/gnome-network-preferences.svg
   trunk/capplets/network/icons/24x24/gnome-network-properties.png   (props changed)
      - copied unchanged from r9197, /trunk/capplets/network/icons/24x24/gnome-network-preferences.png
   trunk/capplets/network/icons/32x32/gnome-network-properties.png   (props changed)
      - copied unchanged from r9197, /trunk/capplets/network/icons/32x32/gnome-network-preferences.png
   trunk/capplets/network/icons/32x32/gnome-network-properties.svg   (props changed)
      - copied unchanged from r9197, /trunk/capplets/network/icons/32x32/gnome-network-preferences.svg
   trunk/capplets/network/icons/48x48/gnome-network-properties.png   (props changed)
      - copied unchanged from r9197, /trunk/capplets/network/icons/48x48/gnome-network-preferences.png
   trunk/capplets/network/icons/scalable/gnome-network-properties.svg   (props changed)
      - copied unchanged from r9197, /trunk/capplets/network/icons/scalable/gnome-network-preferences.svg
Removed:
   trunk/capplets/network/gnome-network-preferences.c
   trunk/capplets/network/gnome-network-preferences.desktop.in.in
   trunk/capplets/network/gnome-network-preferences.glade
   trunk/capplets/network/icons/16x16/gnome-network-preferences.png
   trunk/capplets/network/icons/16x16/gnome-network-preferences.svg
   trunk/capplets/network/icons/22x22/gnome-network-preferences.png
   trunk/capplets/network/icons/22x22/gnome-network-preferences.svg
   trunk/capplets/network/icons/24x24/gnome-network-preferences.png
   trunk/capplets/network/icons/32x32/gnome-network-preferences.png
   trunk/capplets/network/icons/32x32/gnome-network-preferences.svg
   trunk/capplets/network/icons/48x48/gnome-network-preferences.png
   trunk/capplets/network/icons/scalable/gnome-network-preferences.svg
Modified:
   trunk/ChangeLog
   trunk/capplets/network/Makefile.am
   trunk/configure.in

Modified: trunk/capplets/network/Makefile.am
==============================================================================
--- trunk/capplets/network/Makefile.am	(original)
+++ trunk/capplets/network/Makefile.am	Tue Jan 13 14:32:37 2009
@@ -1,31 +1,31 @@
 # This is used in GNOMECC_CAPPLETS_CFLAGS
 cappletname = network
 
-bin_PROGRAMS = gnome-network-preferences
+bin_PROGRAMS = gnome-network-properties
 
-gnome_network_preferences_SOURCES = gnome-network-preferences.c
-gnome_network_preferences_LDADD = $(GNOMECC_CAPPLETS_LIBS)
+gnome_network_properties_SOURCES = gnome-network-properties.c
+gnome_network_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS)
 
 @INTLTOOL_DESKTOP_RULE@
 
 gladedir = $(pkgdatadir)/glade
-dist_glade_DATA = gnome-network-preferences.glade
+dist_glade_DATA = gnome-network-properties.glade
 
 icons16dir = $(datadir)/icons/hicolor/16x16/apps
-dist_icons16_DATA = icons/16x16/gnome-network-preferences.png
+dist_icons16_DATA = icons/16x16/gnome-network-properties.png
 icons22dir = $(datadir)/icons/hicolor/22x22/apps
-dist_icons22_DATA = icons/22x22/gnome-network-preferences.png
+dist_icons22_DATA = icons/22x22/gnome-network-properties.png
 icons24dir = $(datadir)/icons/hicolor/24x24/apps
-dist_icons24_DATA = icons/24x24/gnome-network-preferences.png
+dist_icons24_DATA = icons/24x24/gnome-network-properties.png
 icons32dir = $(datadir)/icons/hicolor/32x32/apps
-dist_icons32_DATA = icons/32x32/gnome-network-preferences.png
+dist_icons32_DATA = icons/32x32/gnome-network-properties.png
 icons48dir = $(datadir)/icons/hicolor/48x48/apps
-dist_icons48_DATA = icons/48x48/gnome-network-preferences.png
+dist_icons48_DATA = icons/48x48/gnome-network-properties.png
 iconssvgdir = $(datadir)/icons/hicolor/scalable/apps
-dist_iconssvg_DATA = icons/scalable/gnome-network-preferences.svg
+dist_iconssvg_DATA = icons/scalable/gnome-network-properties.svg
 
 desktopdir = $(datadir)/applications
-desktop_in_files = gnome-network-preferences.desktop.in
+desktop_in_files = gnome-network-properties.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 INCLUDES = \

Copied: trunk/capplets/network/gnome-network-properties.c (from r9197, /trunk/capplets/network/gnome-network-preferences.c)
==============================================================================
--- /trunk/capplets/network/gnome-network-preferences.c	(original)
+++ trunk/capplets/network/gnome-network-properties.c	Tue Jan 13 14:32:37 2009
@@ -1,4 +1,4 @@
-/* gnome-network-preferences.c: network preferences capplet
+/* gnome-network-properties.c: network preferences capplet
  *
  * Copyright (C) 2002 Sun Microsystems Inc.
  *
@@ -231,7 +231,7 @@
 		return;
 	}
 
-	dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-network-preferences.glade",
+	dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-network-properties.glade",
 				"details_dialog", NULL);
 
 	details_dialog = widget = WID ("details_dialog");
@@ -258,7 +258,7 @@
 	g_signal_connect (widget, "response",
 			  G_CALLBACK (cb_details_dialog_response), NULL);
 
-	capplet_set_icon (widget, "gnome-network-preferences");
+	capplet_set_icon (widget, "gnome-network-properties");
 
 	gtk_widget_show_all (widget);
 }
@@ -730,7 +730,7 @@
 
 	client = gconf_client_get_default ();
 
-	dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-network-preferences.glade",
+	dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-network-properties.glade",
 				"location_new_dialog", NULL);
 
 	gtk_button_set_image (GTK_BUTTON (WID ("new_location")),
@@ -1224,12 +1224,12 @@
 	gconf_client_add_dir (client, "/system/proxy",
 			      GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 
-	dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-network-preferences.glade",
+	dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-network-properties.glade",
 				"network_dialog", NULL);
 
 	setup_dialog (dialog);
 	widget = WID ("network_dialog");
-	capplet_set_icon (widget, "gnome-network-preferences");
+	capplet_set_icon (widget, "gnome-network-properties");
 	gtk_widget_show_all (widget);
 	gtk_main ();
 

Copied: trunk/capplets/network/gnome-network-properties.desktop.in.in (from r9197, /trunk/capplets/network/gnome-network-preferences.desktop.in.in)
==============================================================================
--- /trunk/capplets/network/gnome-network-preferences.desktop.in.in	(original)
+++ trunk/capplets/network/gnome-network-properties.desktop.in.in	Tue Jan 13 14:32:37 2009
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Network Proxy
 _Comment=Set your network proxy preferences
-Exec=gnome-network-preferences
+Exec=gnome-network-properties
 Icon=gnome-network-preferences
 Terminal=false
 Type=Application

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jan 13 14:32:37 2009
@@ -302,7 +302,7 @@
 capplets/mouse/Makefile
 capplets/mouse/gnome-settings-mouse.desktop.in
 capplets/network/Makefile
-capplets/network/gnome-network-preferences.desktop.in
+capplets/network/gnome-network-properties.desktop.in
 capplets/windows/Makefile
 capplets/windows/window-properties.desktop.in
 font-viewer/Makefile