Author: sreeves1 Date: Sat Aug 25 02:17:51 2007 New Revision: 40483 URL: http://svn.opensuse.org/viewcvs/yast?rev=40483&view=rev Log: Fix for 247684 - remove empty icon hierarchy Fix for 8097 - use new yast window icon Fix for 297243 - change app armor icon name Modified: trunk/control-center-gnome/etc/Makefile.am trunk/control-center-gnome/etc/yast-gnome-apparmor.directory trunk/control-center-gnome/etc/yast-gnome-hardware.directory trunk/control-center-gnome/etc/yast-gnome-misc.directory trunk/control-center-gnome/etc/yast-gnome-net-devices.directory trunk/control-center-gnome/etc/yast-gnome-net-services.directory trunk/control-center-gnome/etc/yast-gnome-security.directory trunk/control-center-gnome/etc/yast-gnome-software.directory trunk/control-center-gnome/etc/yast-gnome-system.directory trunk/control-center-gnome/etc/yast-gnome-virtualization.directory trunk/control-center-gnome/src/control-center.c Modified: trunk/control-center-gnome/etc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/etc/Makefile.am?rev=40483&r1=40482&r2=40483&view=diff ============================================================================== --- trunk/control-center-gnome/etc/Makefile.am (original) +++ trunk/control-center-gnome/etc/Makefile.am Sat Aug 25 02:17:51 2007 @@ -9,33 +9,16 @@ directorydir = $(datadir)/desktop-directories directory_DATA = $(wildcard yast-gnome-*.directory) -NLD_YAST_THEME_DIR = /usr/share/YaST2/theme/NLD -SL_YAST_THEME_DIR = /usr/share/YaST2/theme/SuSELinux - $(schemas_DATA): $(schemas_DATA).in sed -e "s|\@DATADIR\@|$(datadir)|g" $< > $@ -# ----------------------------------------------------- -# clobber the NLD yast2 theme to make it an icon theme -# this hack should be in the themes themselves. -# ----------------------------------------------------- -indexdir = $(NLD_YAST_THEME_DIR)/icons -index_DATA = index.theme -index2dir = $(SL_YAST_THEME_DIR)/icons -index2_DATA = index.theme -# we also require a symlink to make it look like a theme -link-hicolor: - mkdir -p $(DESTDIR)$(NLD_YAST_THEME_DIR) ; ln -sf icons $(DESTDIR)$(NLD_YAST_THEME_DIR)/hicolor - mkdir -p $(DESTDIR)$(SL_YAST_THEME_DIR) ; ln -sf icons $(DESTDIR)$(SL_YAST_THEME_DIR)/hicolor -# ----------------------------------------------------- - -install-data-local: link-hicolor +install-data-local: if test -z "$(DESTDIR)" ; then \ for p in $(schemas_DATA) ; do \ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ done \ fi -EXTRA_DIST = $(schemas_DATA).in $(menu_DATA) $(directory_DATA) $(index_DATA) +EXTRA_DIST = $(schemas_DATA).in $(menu_DATA) $(directory_DATA) CLEANFILES = $(schemas_DATA) Modified: trunk/control-center-gnome/etc/yast-gnome-apparmor.directory URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/etc/yast-gnome-apparmor.directory?rev=40483&r1=40482&r2=40483&view=diff ============================================================================== --- trunk/control-center-gnome/etc/yast-gnome-apparmor.directory (original) +++ trunk/control-center-gnome/etc/yast-gnome-apparmor.directory Sat Aug 25 02:17:51 2007 @@ -2,7 +2,6 @@ Type=Directory Icon=apparmor_app_armor -X-SuSE-translate=true X-SuSE-DocTeamID=ycc_apparmor Name=Novell AppArmor Modified: trunk/control-center-gnome/etc/yast-gnome-hardware.directory URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/etc/yast-gnome-hardware.directory?rev=40483&r1=40482&r2=40483&view=diff ============================================================================== --- trunk/control-center-gnome/etc/yast-gnome-hardware.directory (original) +++ trunk/control-center-gnome/etc/yast-gnome-hardware.directory Sat Aug 25 02:17:51 2007 @@ -2,7 +2,6 @@ Type=Directory Icon=yast-hardware -X-SuSE-translate=true X-SuSE-DocTeamID=ycc_hardware Name=Hardware Modified: trunk/control-center-gnome/etc/yast-gnome-misc.directory URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/etc/yast-gnome-misc.directory?rev=40483&r1=40482&r2=40483&view=diff ============================================================================== --- trunk/control-center-gnome/etc/yast-gnome-misc.directory (original) +++ trunk/control-center-gnome/etc/yast-gnome-misc.directory Sat Aug 25 02:17:51 2007 @@ -2,7 +2,6 @@ Type=Directory Icon=yast-misc -X-SuSE-translate=true X-SuSE-DocTeamID=ycc_misc Name=Miscellaneous Name[cs]=Různé Modified: trunk/control-center-gnome/etc/yast-gnome-net-devices.directory URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/etc/yast-gnome-net-devices.directory?rev=40483&r1=40482&r2=40483&view=diff ============================================================================== --- trunk/control-center-gnome/etc/yast-gnome-net-devices.directory (original) +++ trunk/control-center-gnome/etc/yast-gnome-net-devices.directory Sat Aug 25 02:17:51 2007 @@ -2,7 +2,6 @@ Type=Directory Icon=yast-network_devices -X-SuSE-translate=true X-SuSE-DocTeamID=ycc_network_devices Name=Network Devices Modified: trunk/control-center-gnome/etc/yast-gnome-net-services.directory URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/etc/yast-gnome-net-services.directory?rev=40483&r1=40482&r2=40483&view=diff ============================================================================== --- trunk/control-center-gnome/etc/yast-gnome-net-services.directory (original) +++ trunk/control-center-gnome/etc/yast-gnome-net-services.directory Sat Aug 25 02:17:51 2007 @@ -2,7 +2,6 @@ Type=Directory Icon=yast-network_services -X-SuSE-translate=true X-SuSE-DocTeamID=ycc_network_services Name=Network Services Modified: trunk/control-center-gnome/etc/yast-gnome-security.directory URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/etc/yast-gnome-security.directory?rev=40483&r1=40482&r2=40483&view=diff ============================================================================== --- trunk/control-center-gnome/etc/yast-gnome-security.directory (original) +++ trunk/control-center-gnome/etc/yast-gnome-security.directory Sat Aug 25 02:17:51 2007 @@ -2,7 +2,6 @@ Type=Directory Icon=yast-security -X-SuSE-translate=true X-SuSE-DocTeamID=ycc_security Name=Security and Users Modified: trunk/control-center-gnome/etc/yast-gnome-software.directory URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/etc/yast-gnome-software.directory?rev=40483&r1=40482&r2=40483&view=diff ============================================================================== --- trunk/control-center-gnome/etc/yast-gnome-software.directory (original) +++ trunk/control-center-gnome/etc/yast-gnome-software.directory Sat Aug 25 02:17:51 2007 @@ -2,7 +2,6 @@ Type=Directory Icon=yast-software -X-SuSE-translate=true X-SuSE-DocTeamID=ycc_software Name=Software Modified: trunk/control-center-gnome/etc/yast-gnome-system.directory URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/etc/yast-gnome-system.directory?rev=40483&r1=40482&r2=40483&view=diff ============================================================================== --- trunk/control-center-gnome/etc/yast-gnome-system.directory (original) +++ trunk/control-center-gnome/etc/yast-gnome-system.directory Sat Aug 25 02:17:51 2007 @@ -2,7 +2,6 @@ Type=Directory Icon=yast-system -X-SuSE-translate=true X-SuSE-DocTeamID=ycc_system Name=System Modified: trunk/control-center-gnome/etc/yast-gnome-virtualization.directory URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/etc/yast-gnome-virtualization.directory?rev=40483&r1=40482&r2=40483&view=diff ============================================================================== --- trunk/control-center-gnome/etc/yast-gnome-virtualization.directory (original) +++ trunk/control-center-gnome/etc/yast-gnome-virtualization.directory Sat Aug 25 02:17:51 2007 @@ -16,6 +16,5 @@ Name=Virtualization -X-SuSE-translate=true Modified: trunk/control-center-gnome/src/control-center.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/src/control-center.c?rev=40483&r1=40482&r2=40483&view=diff ============================================================================== --- trunk/control-center-gnome/src/control-center.c (original) +++ trunk/control-center-gnome/src/control-center.c Sat Aug 25 02:17:51 2007 @@ -161,7 +161,7 @@ g_signal_connect (bonobo_app, "new-instance", G_CALLBACK (apss_new_instance_cb), app_data); textdomain (YAST_CC_PACKAGE); create_main_window (app_data, widget_theming_name, _("YaST2 Control Center"), - "gnome-control-center", 975, 600, hidden); + "yast-shell", 975, 600, hidden); textdomain (GNOME_MAIN_MENU_PACKAGE); if (bonobo_app) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org