[arch-commits] Commit in libfm/trunk (2 files)
Date: Tuesday, October 14, 2014 @ 22:27:42
Author: foutrelis
Revision: 120672
upgpkg: libfm 1.2.3-1
New upstream release.
Modified:
libfm/trunk/PKGBUILD
Deleted:
libfm/trunk/0001-Fix-default-app-detection-in-App-chooser-combo-box.patch
---+
0001-Fix-default-app-detection-in-App-chooser-combo-box.patch | 39 --
PKGBUILD | 16 +---
2 files changed, 4 insertions(+), 51 deletions(-)
Deleted: 0001-Fix-default-app-detection-in-App-chooser-combo-box.patch
===
--- 0001-Fix-default-app-detection-in-App-chooser-combo-box.patch
2014-10-14 18:33:22 UTC (rev 120671)
+++ 0001-Fix-default-app-detection-in-App-chooser-combo-box.patch
2014-10-14 20:27:42 UTC (rev 120672)
@@ -1,39 +0,0 @@
-From 1a3f8dd076b119c685614ffe68a9cb732e2eeaee Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras evange...@foutrelis.com
-Date: Mon, 6 Oct 2014 16:41:09 +0300
-Subject: [PATCH] Fix default app detection in App chooser combo box
-
-Beginning with glib = 2.41, g_app_info_get_all_for_type() no longer
-puts the default application in front of the list.
-
-So now we have to use g_app_info_get_default_for_type().
- src/gtk/fm-app-chooser-combo-box.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/gtk/fm-app-chooser-combo-box.c
b/src/gtk/fm-app-chooser-combo-box.c
-index a9d544e..f8c5cb9 100644
a/src/gtk/fm-app-chooser-combo-box.c
-+++ b/src/gtk/fm-app-chooser-combo-box.c
-@@ -179,8 +179,7 @@ void fm_app_chooser_combo_box_setup(GtkComboBox* combo,
FmMimeType* mime_type, G
- {
- data-mime_type = fm_mime_type_ref(mime_type);
- apps =
g_app_info_get_all_for_type(fm_mime_type_get_type(data-mime_type));
--if(apps)
--sel = G_APP_INFO(apps-data); /* default app is the first one in
the list. */
-+sel =
g_app_info_get_default_for_type(fm_mime_type_get_type(data-mime_type), FALSE);
- }
-
- for(l = apps; l; l = l-next)
-@@ -205,6 +204,8 @@ void fm_app_chooser_combo_box_setup(GtkComboBox* combo,
FmMimeType* mime_type, G
- g_list_foreach(apps, (GFunc)g_object_unref, NULL);
- g_list_free(apps);
- }
-+if(sel)
-+g_object_unref(sel);
- }
-
- gtk_list_store_append(store, it); /* separator */
---
-2.1.2
-
Modified: PKGBUILD
===
--- PKGBUILD2014-10-14 18:33:22 UTC (rev 120671)
+++ PKGBUILD2014-10-14 20:27:42 UTC (rev 120672)
@@ -7,8 +7,8 @@
pkgbase=libfm
pkgname=(libfm libfm-extra)
-pkgver=1.2.2.1
-pkgrel=3
+pkgver=1.2.3
+pkgrel=1
pkgdesc='Library for file management'
url='http://pcmanfm.sourceforge.net/'
arch=('i686' 'x86_64')
@@ -18,17 +18,9 @@
replaces=('lxshortcut')
provides=('lxshortcut')
conflicts=('lxshortcut')
-source=(http://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz
-0001-Fix-default-app-detection-in-App-chooser-combo-box.patch)
-md5sums=('f898c480b142b56471377ef3a2810f2d'
- '10ece6d3a98f1244a82929b7c7ceba2a')
+source=(http://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz)
+md5sums=('3ff38200701658f7e80e25ed395d92dd')
-prepare() {
- cd $pkgbase-$pkgver
-
- patch -Np1 -i
../0001-Fix-default-app-detection-in-App-chooser-combo-box.patch
-}
-
build() {
cd $pkgbase-$pkgver
./configure --prefix=/usr \
[arch-commits] Commit in libfm/trunk (2 files)
Date: Monday, October 6, 2014 @ 16:54:56
Author: foutrelis
Revision: 120278
upgpkg: libfm 1.2.2.1-2
Fix default app detection in App chooser combo box.
(Patch also sent upstream.)
Added:
libfm/trunk/0001-Fix-default-app-detection-in-App-chooser-combo-box.patch
Modified:
libfm/trunk/PKGBUILD
---+
0001-Fix-default-app-detection-in-App-chooser-combo-box.patch | 39 ++
PKGBUILD | 17 +++-
2 files changed, 52 insertions(+), 4 deletions(-)
Added: 0001-Fix-default-app-detection-in-App-chooser-combo-box.patch
===
--- 0001-Fix-default-app-detection-in-App-chooser-combo-box.patch
(rev 0)
+++ 0001-Fix-default-app-detection-in-App-chooser-combo-box.patch
2014-10-06 14:54:56 UTC (rev 120278)
@@ -0,0 +1,39 @@
+From 1a3f8dd076b119c685614ffe68a9cb732e2eeaee Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras evange...@foutrelis.com
+Date: Mon, 6 Oct 2014 16:41:09 +0300
+Subject: [PATCH] Fix default app detection in App chooser combo box
+
+Beginning with glib = 2.41, g_app_info_get_all_for_type() no longer
+puts the default application in front of the list.
+
+So now we have to use g_app_info_get_default_for_type().
+---
+ src/gtk/fm-app-chooser-combo-box.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/gtk/fm-app-chooser-combo-box.c
b/src/gtk/fm-app-chooser-combo-box.c
+index a9d544e..f8c5cb9 100644
+--- a/src/gtk/fm-app-chooser-combo-box.c
b/src/gtk/fm-app-chooser-combo-box.c
+@@ -179,8 +179,7 @@ void fm_app_chooser_combo_box_setup(GtkComboBox* combo,
FmMimeType* mime_type, G
+ {
+ data-mime_type = fm_mime_type_ref(mime_type);
+ apps =
g_app_info_get_all_for_type(fm_mime_type_get_type(data-mime_type));
+-if(apps)
+-sel = G_APP_INFO(apps-data); /* default app is the first one in
the list. */
++sel =
g_app_info_get_default_for_type(fm_mime_type_get_type(data-mime_type), FALSE);
+ }
+
+ for(l = apps; l; l = l-next)
+@@ -205,6 +204,8 @@ void fm_app_chooser_combo_box_setup(GtkComboBox* combo,
FmMimeType* mime_type, G
+ g_list_foreach(apps, (GFunc)g_object_unref, NULL);
+ g_list_free(apps);
+ }
++if(sel)
++g_object_unref(sel);
+ }
+
+ gtk_list_store_append(store, it); /* separator */
+--
+2.1.2
+
Modified: PKGBUILD
===
--- PKGBUILD2014-10-06 14:52:42 UTC (rev 120277)
+++ PKGBUILD2014-10-06 14:54:56 UTC (rev 120278)
@@ -1,5 +1,6 @@
# $Id$
-# Maintainer: Bartłomiej Piotrowski bpiotrow...@archlinux.org
+# Maintainer:
+# Contributor: Bartłomiej Piotrowski bpiotrow...@archlinux.org
# Contributor: Unknown47 unknown...@gmail.com
# Contributor: Angel Velasquez an...@archlinux.org
# Contributor: Juergen Hoetzel juer...@archlinux.org
@@ -6,7 +7,7 @@
pkgname=libfm
pkgver=1.2.2.1
-pkgrel=1
+pkgrel=2
pkgdesc='Library for file management'
url='http://pcmanfm.sourceforge.net/'
arch=('i686' 'x86_64')
@@ -17,9 +18,17 @@
provides=('lxshortcut')
conflicts=('lxshortcut')
install=libfm.install
-source=(http://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz)
-md5sums=('f898c480b142b56471377ef3a2810f2d')
+source=(http://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz
+0001-Fix-default-app-detection-in-App-chooser-combo-box.patch)
+md5sums=('f898c480b142b56471377ef3a2810f2d'
+ '10ece6d3a98f1244a82929b7c7ceba2a')
+prepare() {
+ cd $pkgname-$pkgver
+
+ patch -Np1 -i
../0001-Fix-default-app-detection-in-App-chooser-combo-box.patch
+}
+
build() {
cd $pkgname-$pkgver
./configure --prefix=/usr \
[arch-commits] Commit in libfm/trunk (2 files)
Date: Monday, November 1, 2010 @ 14:32:14
Author: angvp
Revision: 97731
upgpkg: libfm 0.1.14-2
Adding patch for FS#21405
Added:
libfm/trunk/0001-filename-with-spaces-not-supported.patch
Modified:
libfm/trunk/PKGBUILD
---+
0001-filename-with-spaces-not-supported.patch | 345
PKGBUILD |9
2 files changed, 351 insertions(+), 3 deletions(-)
Added: 0001-filename-with-spaces-not-supported.patch
===
--- 0001-filename-with-spaces-not-supported.patch
(rev 0)
+++ 0001-filename-with-spaces-not-supported.patch 2010-11-01 18:32:14 UTC
(rev 97731)
@@ -0,0 +1,345 @@
+From 96fa31c757189c7c5f60d4de4c2df236d2cba0ea Mon Sep 17 00:00:00 2001
+From: Hong Jen Yee (PCMan) pcman...@gmail.com
+Date: Wed, 20 Oct 2010 06:40:51 +0800
+Subject: [PATCH] Fix #3089625 - Filenames with spaces not supported in
copy/paste.
+
+---
+ src/base/fm-file-launcher.c |2 +-
+ src/base/fm-folder.c|6 +-
+ src/base/fm-path.c |2 +-
+ src/gtk/fm-folder-view.c| 130 +-
+ src/gtk/fm-gtk-utils.c | 10 +--
+ src/gtk/fm-path-entry.c |2 +-
+ 6 files changed, 75 insertions(+), 77 deletions(-)
+
+diff --git a/src/base/fm-file-launcher.c b/src/base/fm-file-launcher.c
+index 3857c33..c356249 100644
+--- a/src/base/fm-file-launcher.c
b/src/base/fm-file-launcher.c
+@@ -91,7 +91,7 @@ gboolean fm_launch_desktop_entry(GAppLaunchContext* ctx,
const char* file_or_id,
+ * e.g: If this URL points to the another
desktop entry file, and it
+ * points to yet another desktop entry file,
this can create a
+ * infinite loop. This is a extremely rare
case. */
+-FmPath* path = fm_path_new(url);
++FmPath* path = fm_path_new_for_uri(url);
+ _uris = g_list_prepend(_uris, path);
+ ret = fm_launch_paths(ctx, _uris, launcher,
user_data);
+ g_list_free(_uris);
+diff --git a/src/base/fm-folder.c b/src/base/fm-folder.c
+index ccbb3cc..3474937 100644
+--- a/src/base/fm-folder.c
b/src/base/fm-folder.c
+@@ -334,8 +334,8 @@ static void on_job_finished(FmDirListJob* job, FmFolder*
folder)
+
+ static FmJobErrorAction on_job_err(FmDirListJob* job, GError* err,
FmJobErrorSeverity severity, FmFolder* folder)
+ {
+- FmJobErrorAction ret;
+- g_signal_emit(folder, signals[ERROR], 0, err, severity, ret);
++FmJobErrorAction ret;
++g_signal_emit(folder, signals[ERROR], 0, err, severity, ret);
+ return ret;
+ }
+
+@@ -470,7 +470,7 @@ FmFolder* fm_folder_get_for_path(FmPath* path)
+
+ FmFolder* fm_folder_get_for_path_name(const char* path)
+ {
+-FmPath* fm_path = fm_path_new(path);
++FmPath* fm_path = fm_path_new_for_str(path);
+ FmFolder* folder = fm_folder_get_internal(fm_path, NULL);
+ fm_path_unref(fm_path);
+ return folder;
+diff --git a/src/base/fm-path.c b/src/base/fm-path.c
+index ca62256..8b31de2 100644
+--- a/src/base/fm-path.c
b/src/base/fm-path.c
+@@ -926,7 +926,7 @@ FmPathList* fm_path_list_new_from_uris(const char** uris)
+ FmPathList* pl = fm_path_list_new();
+ for(uri = uris; *uri; ++uri)
+ {
+-FmPath* path = fm_path_new(*uri);
++FmPath* path = fm_path_new_for_uri(*uri);
+ fm_list_push_tail_noref(pl, path);
+ }
+ return pl;
+diff --git a/src/gtk/fm-folder-view.c b/src/gtk/fm-folder-view.c
+index fab88c0..9943015 100644
+--- a/src/gtk/fm-folder-view.c
b/src/gtk/fm-folder-view.c
+@@ -41,8 +41,8 @@
+
+ enum{
+ CHDIR,
+- LOADED,
+- STATUS,
++LOADED,
++STATUS,
+ CLICKED,
+ SEL_CHANGED,
+ SORT_CHANGED,
+@@ -82,7 +82,7 @@ static void fm_folder_view_class_init(FmFolderViewClass
*klass)
+ {
+ GObjectClass *g_object_class;
+ GtkWidgetClass *widget_class;
+- FmFolderViewClass *fv_class;
++FmFolderViewClass *fv_class;
+ g_object_class = G_OBJECT_CLASS(klass);
+ g_object_class-finalize = fm_folder_view_finalize;
+ widget_class = GTK_WIDGET_CLASS(klass);
+@@ -165,19 +165,19 @@ gboolean on_folder_view_focus_in(GtkWidget* widget,
GdkEventFocus* evt)
+
+ void on_chdir(FmFolderView* fv, FmPath* dir_path)
+ {
+- GtkWidget* toplevel = gtk_widget_get_toplevel((GtkWidget*)fv);
+- if(GTK_WIDGET_REALIZED(toplevel))
+- {
+- GdkCursor* cursor = gdk_cursor_new(GDK_WATCH);
+- gdk_window_set_cursor(toplevel-window, cursor);
+- }
++GtkWidget* toplevel = gtk_widget_get_toplevel((GtkWidget*)fv);
++if(GTK_WIDGET_REALIZED(toplevel))
++{
++GdkCursor* cursor = gdk_cursor_new(GDK_WATCH);
++
