File pcmanfm-rename-to-pcmanfm.patch of Package pcmanfm

Overview Repositories Revisions Requests Users Attributes Meta

File pcmanfm-rename-to-pcmanfm.patch of Package pcmanfm (Revision b88e9f8b085122bcafab484f97b7901f)

Currently displaying revision b88e9f8b085122bcafab484f97b7901f , Show latest

diff -uNr old-pcmanfm//configure.ac pcmanfm/configure.ac
--- old-pcmanfm//configure.ac	2010-03-24 09:21:44.081279517 +0100
+++ pcmanfm/configure.ac	2010-03-24 09:21:57.295294878 +0100
@@ -93,7 +93,7 @@
 AC_SUBST(MENU_CACHE_CFLAGS)
 AC_SUBST(MENU_CACHE_LIBS)
 
-GETTEXT_PACKAGE=pcmanfm2
+GETTEXT_PACKAGE=pcmanfm
 AC_SUBST(GETTEXT_PACKAGE)
 
 # Generate po/LINGUAS on the fly rather than relying on translators
@@ -116,7 +116,7 @@
     data/Makefile
     data/ui/Makefile
     data/ui/about.glade
-    data/pcmanfm2.desktop
+    data/pcmanfm.desktop
 ])
 
 AC_OUTPUT
diff -uNr old-pcmanfm//data/Makefile.am pcmanfm/data/Makefile.am
--- old-pcmanfm//data/Makefile.am	2010-03-24 09:21:44.072273692 +0100
+++ pcmanfm/data/Makefile.am	2010-03-24 09:21:57.298520917 +0100
@@ -4,5 +4,5 @@
 
 desktopdir=$(datadir)/applications
 desktop_DATA= \
-	pcmanfm2.desktop \
+	pcmanfm.desktop \
 	$(NULL)
diff -uNr old-pcmanfm//data/pcmanfm2.desktop.in pcmanfm/data/pcmanfm2.desktop.in
--- old-pcmanfm//data/pcmanfm2.desktop.in	2010-03-24 09:21:44.073271864 +0100
+++ pcmanfm/data/pcmanfm2.desktop.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-[Desktop Entry]
-Type=Application
-Icon=system-file-manager
-Name=File Manager
-Name[de]=Dateimanager
-Name[et]=Failihaldur
-Name[fi]=Tiedostonhallinta
-Name[ja]=ファイルマネージャ
-Name[ru]=Файловый менеджер
-Name[zh_TW]=檔案管理程式
-GenericName=File Manager
-GenericName[de]=Dateimanager
-GenericName[et]=Failihaldur
-GenericName[fi]=Tiedostonhallinta
-GenericName[ja]=ファイルマネージャ
-GenericName[ru]=Файловый менеджер
-GenericName[zh_TW]=檔案管理程式
-Comment=Browse the file system and manage the files
-Comment[de]=Das Dateisystem durchsuchen und Dateien verwalten
-Comment[et]=Lehitse failisüsteemi ja halda faile
-Comment[fi]=Selaa tiedostojärjestelmää ja hallitse tiedostoja
-Comment[ja]=ファイルシステムをブラウズし、ファイルの管理を行います
-Comment[zh_TW]=瀏覽檔案系統及管理檔案
-Categories=FileManager;Utility;Core;GTK;
-Exec=pcmanfm2 %U
-StartupNotify=true
-Terminal=false
-MimeType=x-directory/normal;inode/directory;
diff -uNr old-pcmanfm//data/pcmanfm.desktop.in pcmanfm/data/pcmanfm.desktop.in
--- old-pcmanfm//data/pcmanfm.desktop.in	1970-01-01 01:00:00.000000000 +0100
+++ pcmanfm/data/pcmanfm.desktop.in	2010-03-24 09:25:16.977273954 +0100
@@ -0,0 +1,28 @@
+[Desktop Entry]
+Type=Application
+Icon=system-file-manager
+Name=File Manager
+Name[de]=Dateimanager
+Name[et]=Failihaldur
+Name[fi]=Tiedostonhallinta
+Name[ja]=ファイルマネージャ
+Name[ru]=Файловый менеджер
+Name[zh_TW]=檔案管理程式
+GenericName=File Manager
+GenericName[de]=Dateimanager
+GenericName[et]=Failihaldur
+GenericName[fi]=Tiedostonhallinta
+GenericName[ja]=ファイルマネージャ
+GenericName[ru]=Файловый менеджер
+GenericName[zh_TW]=檔案管理程式
+Comment=Browse the file system and manage the files
+Comment[de]=Das Dateisystem durchsuchen und Dateien verwalten
+Comment[et]=Lehitse failisüsteemi ja halda faile
+Comment[fi]=Selaa tiedostojärjestelmää ja hallitse tiedostoja
+Comment[ja]=ファイルシステムをブラウズし、ファイルの管理を行います
+Comment[zh_TW]=瀏覽檔案系統及管理檔案
+Categories=FileManager;Utility;Core;GTK;
+Exec=pcmanfm %U
+StartupNotify=true
+Terminal=false
+MimeType=x-directory/normal;inode/directory;
diff -uNr old-pcmanfm//data/ui/Makefile.am pcmanfm/data/ui/Makefile.am
--- old-pcmanfm//data/ui/Makefile.am	2010-03-24 09:21:44.073271864 +0100
+++ pcmanfm/data/ui/Makefile.am	2010-03-24 09:22:11.866272364 +0100
@@ -1,7 +1,7 @@
 NULL=
 
 # GtkBuilder UI definition files
-uidir=$(datadir)/pcmanfm2/ui
+uidir=$(datadir)/pcmanfm/ui
 ui_in_files= \
 	about.glade \
 	pref.glade \
diff -uNr old-pcmanfm//po/POTFILES.skip pcmanfm/po/POTFILES.skip
--- old-pcmanfm//po/POTFILES.skip	2010-03-24 09:21:44.058271351 +0100
+++ pcmanfm/po/POTFILES.skip	2010-03-24 09:22:11.867271095 +0100
@@ -1,3 +1,3 @@
-data/pcmanfm2.desktop.in
+data/pcmanfm.desktop.in
 #we transtale .in file
 data/ui/about.glade
diff -uNr old-pcmanfm//src/main-win.c pcmanfm/src/main-win.c
--- old-pcmanfm//src/main-win.c	2010-03-24 09:21:44.080277364 +0100
+++ pcmanfm/src/main-win.c	2010-03-24 09:22:11.870269940 +0100
@@ -607,9 +607,9 @@
         return;
     }
     if(strstr(app_config->su_cmd, "%s")) /* FIXME: need to rename to pcmanfm when we reach stable release. */
-        cmd = g_strdup_printf(app_config->su_cmd, "pcmanfm2 %U");
+        cmd = g_strdup_printf(app_config->su_cmd, "pcmanfm %U");
     else
-        cmd = g_strconcat(app_config->su_cmd, " ", "pcmanfm2 %U", NULL);
+        cmd = g_strconcat(app_config->su_cmd, " ", "pcmanfm %U", NULL);
     app = g_app_info_create_from_commandline(cmd, NULL, 0, NULL);
     g_free(cmd);
     if(app)
diff -uNr old-pcmanfm//src/Makefile.am pcmanfm/src/Makefile.am
--- old-pcmanfm//src/Makefile.am	2010-03-24 09:21:44.076271896 +0100
+++ pcmanfm/src/Makefile.am	2010-03-24 09:22:11.871278658 +0100
@@ -1,13 +1,13 @@
 NULL=
 
 AM_CPPFLAGS = \
-	-DPACKAGE_DATA_DIR=\""$(datadir)/pcmanfm2"\" \
-	-DPACKAGE_UI_DIR=\""$(datadir)/pcmanfm2/ui"\" \
+	-DPACKAGE_DATA_DIR=\""$(datadir)/pcmanfm"\" \
+	-DPACKAGE_UI_DIR=\""$(datadir)/pcmanfm/ui"\" \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
 
-bin_PROGRAMS = pcmanfm2
+bin_PROGRAMS = pcmanfm
 
-pcmanfm2_SOURCES = \
+pcmanfm_SOURCES = \
 	pcmanfm.c pcmanfm.h \
 	app-config.c app-config.h \
 	main-win.c main-win.h \
@@ -22,7 +22,7 @@
 	desktop-ui.c \
 	$(NULL)
 
-pcmanfm2_CFLAGS = \
+pcmanfm_CFLAGS = \
 	$(XLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(GIO_CFLAGS) \
@@ -34,7 +34,7 @@
 	-Werror-implicit-function-declaration \
 	$(NULL)
 
-pcmanfm2_LDADD = \
+pcmanfm_LDADD = \
 	$(XLIB_LIBS) \
 	$(GTK_LIBS) \
 	$(GIO_LIBS) \
diff -uNr old-pcmanfm//src/pcmanfm.c pcmanfm/src/pcmanfm.c
--- old-pcmanfm//src/pcmanfm.c	2010-03-24 09:21:44.075272467 +0100
+++ pcmanfm/src/pcmanfm.c	2010-03-24 09:22:11.874280716 +0100
@@ -299,7 +299,7 @@
 void get_socket_name( char* buf, int len )
 {
     char* dpy = gdk_get_display();
-    g_snprintf( buf, len, "/tmp/.pcmanfm2-socket%s-%s", dpy, g_get_user_name() );
+    g_snprintf( buf, len, "/tmp/.pcmanfm-socket%s-%s", dpy, g_get_user_name() );
     g_free( dpy );
 }

Places

File pcmanfm-rename-to-pcmanfm.patch of Package pcmanfm (Revision b88e9f8b085122bcafab484f97b7901f)

Places