diff options
author | Chris Lord <chris@openedhand.com> | 2006-09-25 13:40:10 +0000 |
---|---|---|
committer | Chris Lord <chris@openedhand.com> | 2006-09-25 13:40:10 +0000 |
commit | bc6fccce535e98ea31cec739b046451821a30a64 (patch) | |
tree | fc7ddcbde8684c6baf0ce0b595864dd39d9d019c /meta/packages | |
parent | 8d02222ceb0c17c1085c6032bc1a32a5a4a2ff8e (diff) | |
download | poky-bc6fccce535e98ea31cec739b046451821a30a64.tar.gz |
Fix bug #151 (pcmanfm warnings/launcher)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@754 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r-- | meta/packages/pcmanfm/files/desktop.patch | 11 | ||||
-rw-r--r-- | meta/packages/pcmanfm/files/no-warnings.patch | 47 | ||||
-rw-r--r-- | meta/packages/pcmanfm/pcmanfm_0.3.2-beta.bb | 28 |
3 files changed, 86 insertions, 0 deletions
diff --git a/meta/packages/pcmanfm/files/desktop.patch b/meta/packages/pcmanfm/files/desktop.patch new file mode 100644 index 0000000000..764f5b7845 --- /dev/null +++ b/meta/packages/pcmanfm/files/desktop.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | --- pcmanfm-0.3.2-beta/pcmanfm.desktop.in.old 2006-09-25 11:43:07.000000000 +0100 | ||
2 | +++ pcmanfm-0.3.2-beta/pcmanfm.desktop.in 2006-09-25 11:44:59.000000000 +0100 | ||
3 | @@ -1,7 +1,7 @@ | ||
4 | [Desktop Entry] | ||
5 | Categories=Application;System;Utility;Core;GTK; | ||
6 | Encoding=UTF-8 | ||
7 | -Name=PCMan File Manager | ||
8 | +Name=File Manager | ||
9 | Name[zh_TW]=PCMan 檔案管理程式 | ||
10 | Name[pl]=Przeglądarka plików z zakładkami | ||
11 | Exec=pcmanfm %f | ||
diff --git a/meta/packages/pcmanfm/files/no-warnings.patch b/meta/packages/pcmanfm/files/no-warnings.patch new file mode 100644 index 0000000000..2e0d92bd7b --- /dev/null +++ b/meta/packages/pcmanfm/files/no-warnings.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | --- pcmanfm-0.3.2-beta/src/main.c.old 2006-09-25 11:51:51.000000000 +0100 | ||
2 | +++ pcmanfm-0.3.2-beta/src/main.c 2006-09-25 11:51:55.000000000 +0100 | ||
3 | @@ -173,7 +173,7 @@ | ||
4 | gtk_widget_show ( GTK_WIDGET( main_window ) ); | ||
5 | return main_window; | ||
6 | } | ||
7 | - | ||
8 | +#if 0 | ||
9 | static void check_icon_theme() | ||
10 | { | ||
11 | GtkSettings * settings; | ||
12 | @@ -212,7 +212,7 @@ | ||
13 | } | ||
14 | g_free( theme ); | ||
15 | } | ||
16 | - | ||
17 | +#endif | ||
18 | int | ||
19 | main ( int argc, char *argv[] ) | ||
20 | { | ||
21 | @@ -274,7 +274,7 @@ | ||
22 | vfs_file_info_set_thumbnail_size( appSettings.bigIconSize, | ||
23 | appSettings.smallIconSize ); | ||
24 | |||
25 | - check_icon_theme(); | ||
26 | +/* check_icon_theme();*/ | ||
27 | |||
28 | if( appSettings.showDesktop ) | ||
29 | fm_desktop_init(); | ||
30 | --- pcmanfm-0.3.2-beta/src/main-window.c.old 2006-09-25 11:47:45.000000000 +0100 | ||
31 | +++ pcmanfm-0.3.2-beta/src/main-window.c 2006-09-25 11:50:32.000000000 +0100 | ||
32 | @@ -496,6 +496,7 @@ | ||
33 | gtk_window_add_accel_group ( GTK_WINDOW ( main_window ), main_window->accel_group ); | ||
34 | gtk_widget_grab_focus ( GTK_WIDGET( main_window->address_bar ) ); | ||
35 | |||
36 | +#if 0 | ||
37 | /* Create warning bar for super user */ | ||
38 | if ( geteuid() == 0 ) /* Run as super user! */ | ||
39 | { | ||
40 | @@ -510,6 +511,7 @@ | ||
41 | gtk_box_pack_start ( GTK_BOX ( main_window->main_vbox ), | ||
42 | main_window->status_bar, FALSE, FALSE, 2 ); | ||
43 | } | ||
44 | +#endif | ||
45 | |||
46 | /* Create client area */ | ||
47 | main_window->notebook = GTK_NOTEBOOK( gtk_notebook_new () ); | ||
diff --git a/meta/packages/pcmanfm/pcmanfm_0.3.2-beta.bb b/meta/packages/pcmanfm/pcmanfm_0.3.2-beta.bb new file mode 100644 index 0000000000..0802fd600f --- /dev/null +++ b/meta/packages/pcmanfm/pcmanfm_0.3.2-beta.bb | |||
@@ -0,0 +1,28 @@ | |||
1 | LICENSE = "GPL" | ||
2 | DESCRIPTION = "procfs tools" | ||
3 | SECTION = "x11" | ||
4 | PRIORITY = "optional" | ||
5 | MAINTAINER = "Chris Lord <chris@openedhand.com>" | ||
6 | DEPENDS = "gtk+" | ||
7 | |||
8 | SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \ | ||
9 | file://gnome-fs-directory.png \ | ||
10 | file://gnome-fs-regular.png \ | ||
11 | file://gnome-mime-text-plain.png \ | ||
12 | file://emblem-symbolic-link.png \ | ||
13 | file://desktop.patch;patch=1 \ | ||
14 | file://no-warnings.patch;patch=1" | ||
15 | |||
16 | EXTRA_OECONF = "--enable-inotify --disable-hal" | ||
17 | |||
18 | inherit autotools pkgconfig | ||
19 | |||
20 | do_install_append () { | ||
21 | install -d ${D}/${datadir} | ||
22 | install -d ${D}/${datadir}/pixmaps/ | ||
23 | |||
24 | install -m 0644 ${WORKDIR}/*.png ${D}/${datadir}/pixmaps | ||
25 | } | ||
26 | |||
27 | FILES_${PN} += "${datadir}/pixmaps/*.png" | ||
28 | |||