From 4f1b6aafba338a267b6c1b911ceb33358b2eca09 Mon Sep 17 00:00:00 2001 From: Luca Ferretti Date: Tue, 13 Jan 2009 14:32:37 +0000 Subject: [PATCH] Renamed from gnome-network-preferences to gnome-network-properties. Closes 2009-01-13 Luca Ferretti * configure.in: * capplets/network/*: Renamed from gnome-network-preferences to gnome-network-properties. Closes bug #554342 svn path=/trunk/; revision=9198 --- ChangeLog | 7 ++++++ capplets/network/Makefile.am | 22 +++++++++--------- ...eferences.c => gnome-network-properties.c} | 12 +++++----- ...=> gnome-network-properties.desktop.in.in} | 2 +- ...s.glade => gnome-network-properties.glade} | 0 ...ences.png => gnome-network-properties.png} | Bin ...ences.svg => gnome-network-properties.svg} | 0 ...ences.png => gnome-network-properties.png} | Bin ...ences.svg => gnome-network-properties.svg} | 0 ...ences.png => gnome-network-properties.png} | Bin ...ences.png => gnome-network-properties.png} | Bin ...ences.svg => gnome-network-properties.svg} | 0 ...ences.png => gnome-network-properties.png} | Bin ...ences.svg => gnome-network-properties.svg} | 0 configure.in | 2 +- 15 files changed, 26 insertions(+), 19 deletions(-) rename capplets/network/{gnome-network-preferences.c => gnome-network-properties.c} (98%) rename capplets/network/{gnome-network-preferences.desktop.in.in => gnome-network-properties.desktop.in.in} (92%) rename capplets/network/{gnome-network-preferences.glade => gnome-network-properties.glade} (100%) rename capplets/network/icons/16x16/{gnome-network-preferences.png => gnome-network-properties.png} (100%) rename capplets/network/icons/16x16/{gnome-network-preferences.svg => gnome-network-properties.svg} (100%) rename capplets/network/icons/22x22/{gnome-network-preferences.png => gnome-network-properties.png} (100%) rename capplets/network/icons/22x22/{gnome-network-preferences.svg => gnome-network-properties.svg} (100%) rename capplets/network/icons/24x24/{gnome-network-preferences.png => gnome-network-properties.png} (100%) rename capplets/network/icons/32x32/{gnome-network-preferences.png => gnome-network-properties.png} (100%) rename capplets/network/icons/32x32/{gnome-network-preferences.svg => gnome-network-properties.svg} (100%) rename capplets/network/icons/48x48/{gnome-network-preferences.png => gnome-network-properties.png} (100%) rename capplets/network/icons/scalable/{gnome-network-preferences.svg => gnome-network-properties.svg} (100%) diff --git a/ChangeLog b/ChangeLog index fbd62fded..64d75855a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-01-13 Luca Ferretti + + * configure.in: + * capplets/network/*: + Renamed from gnome-network-preferences to gnome-network-properties. + Closes bug #554342 + ==================== 2.25.3 ==================== 2008-12-18 Bastien Nocera diff --git a/capplets/network/Makefile.am b/capplets/network/Makefile.am index 68c8a5a1a..0622083ca 100644 --- a/capplets/network/Makefile.am +++ b/capplets/network/Makefile.am @@ -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 = \ diff --git a/capplets/network/gnome-network-preferences.c b/capplets/network/gnome-network-properties.c similarity index 98% rename from capplets/network/gnome-network-preferences.c rename to capplets/network/gnome-network-properties.c index dd09dbcd6..f6ea0e642 100644 --- a/capplets/network/gnome-network-preferences.c +++ b/capplets/network/gnome-network-properties.c @@ -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 @@ cb_http_details_button_clicked (GtkWidget *button, 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 @@ cb_http_details_button_clicked (GtkWidget *button, 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 @@ location_new (GladeXML *capplet, GtkWidget *parent) 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 @@ main (int argc, char **argv) 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 (); diff --git a/capplets/network/gnome-network-preferences.desktop.in.in b/capplets/network/gnome-network-properties.desktop.in.in similarity index 92% rename from capplets/network/gnome-network-preferences.desktop.in.in rename to capplets/network/gnome-network-properties.desktop.in.in index 7ed598372..4342e00bb 100644 --- a/capplets/network/gnome-network-preferences.desktop.in.in +++ b/capplets/network/gnome-network-properties.desktop.in.in @@ -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 diff --git a/capplets/network/gnome-network-preferences.glade b/capplets/network/gnome-network-properties.glade similarity index 100% rename from capplets/network/gnome-network-preferences.glade rename to capplets/network/gnome-network-properties.glade diff --git a/capplets/network/icons/16x16/gnome-network-preferences.png b/capplets/network/icons/16x16/gnome-network-properties.png similarity index 100% rename from capplets/network/icons/16x16/gnome-network-preferences.png rename to capplets/network/icons/16x16/gnome-network-properties.png diff --git a/capplets/network/icons/16x16/gnome-network-preferences.svg b/capplets/network/icons/16x16/gnome-network-properties.svg similarity index 100% rename from capplets/network/icons/16x16/gnome-network-preferences.svg rename to capplets/network/icons/16x16/gnome-network-properties.svg diff --git a/capplets/network/icons/22x22/gnome-network-preferences.png b/capplets/network/icons/22x22/gnome-network-properties.png similarity index 100% rename from capplets/network/icons/22x22/gnome-network-preferences.png rename to capplets/network/icons/22x22/gnome-network-properties.png diff --git a/capplets/network/icons/22x22/gnome-network-preferences.svg b/capplets/network/icons/22x22/gnome-network-properties.svg similarity index 100% rename from capplets/network/icons/22x22/gnome-network-preferences.svg rename to capplets/network/icons/22x22/gnome-network-properties.svg diff --git a/capplets/network/icons/24x24/gnome-network-preferences.png b/capplets/network/icons/24x24/gnome-network-properties.png similarity index 100% rename from capplets/network/icons/24x24/gnome-network-preferences.png rename to capplets/network/icons/24x24/gnome-network-properties.png diff --git a/capplets/network/icons/32x32/gnome-network-preferences.png b/capplets/network/icons/32x32/gnome-network-properties.png similarity index 100% rename from capplets/network/icons/32x32/gnome-network-preferences.png rename to capplets/network/icons/32x32/gnome-network-properties.png diff --git a/capplets/network/icons/32x32/gnome-network-preferences.svg b/capplets/network/icons/32x32/gnome-network-properties.svg similarity index 100% rename from capplets/network/icons/32x32/gnome-network-preferences.svg rename to capplets/network/icons/32x32/gnome-network-properties.svg diff --git a/capplets/network/icons/48x48/gnome-network-preferences.png b/capplets/network/icons/48x48/gnome-network-properties.png similarity index 100% rename from capplets/network/icons/48x48/gnome-network-preferences.png rename to capplets/network/icons/48x48/gnome-network-properties.png diff --git a/capplets/network/icons/scalable/gnome-network-preferences.svg b/capplets/network/icons/scalable/gnome-network-properties.svg similarity index 100% rename from capplets/network/icons/scalable/gnome-network-preferences.svg rename to capplets/network/icons/scalable/gnome-network-properties.svg diff --git a/configure.in b/configure.in index b0c7179eb..9ad0986f2 100644 --- a/configure.in +++ b/configure.in @@ -302,7 +302,7 @@ capplets/keyboard/keyboard.desktop.in 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