rpms/pcmanfm/devel pcmanfm-0.3.9.98-try-supress-warning.patch, NONE, 1.1 pcmanfm.spec, 1.10, 1.11

Mamoru Tasaka (mtasaka) fedora-extras-commits at redhat.com
Sat Apr 12 17:05:35 UTC 2008


Author: mtasaka

Update of /cvs/extras/rpms/pcmanfm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32520/devel

Modified Files:
	pcmanfm.spec 
Added Files:
	pcmanfm-0.3.9.98-try-supress-warning.patch 
Log Message:
* Sun Apr 13 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.9.98-2
- First trial to suppress compilation warning (containing fix for
  crash on an occasion)


pcmanfm-0.3.9.98-try-supress-warning.patch:

--- NEW FILE pcmanfm-0.3.9.98-try-supress-warning.patch ---
--- pcmanfm-0.3.9.98/src/desktop/desktop-window.c.debug	2008-04-08 23:55:26.000000000 +0900
+++ pcmanfm-0.3.9.98/src/desktop/desktop-window.c	2008-04-12 23:39:21.000000000 +0900
@@ -24,6 +24,7 @@
 #include "desktop-window.h"
 #include "vfs-file-info.h"
 #include "vfs-mime-type.h"
+#include "vfs-thumbnail-loader.h"
 
 #include "glib-mem.h"
 #include "working-area.h"
@@ -36,6 +37,7 @@
 #include "main-window.h"
 #include "pref-dialog.h"
 #include "ptk-file-browser.h"
+#include "ptk-clipboard.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -46,6 +48,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <string.h>
 
 typedef struct _DesktopItem
 {
@@ -638,7 +641,7 @@
 gboolean on_button_press( GtkWidget* w, GdkEventButton* evt )
 {
     DesktopWindow* self = (DesktopWindow*)w;
-    DesktopItem *item, *clicked_item = NULL;
+    DesktopItem *item = NULL, *clicked_item = NULL;
     GList* l;
 
     clicked_item = hit_test( w, (int)evt->x, (int)evt->y );
--- pcmanfm-0.3.9.98/src/desktop/desktop.c.debug	2008-04-07 05:35:20.000000000 +0900
+++ pcmanfm-0.3.9.98/src/desktop/desktop.c	2008-04-12 23:44:44.000000000 +0900
@@ -38,6 +38,7 @@
 #include "vfs-dir.h"
 
 #include "desktop-window.h"
+#include "desktop.h"
 
 #include "settings.h"
 
--- pcmanfm-0.3.9.98/src/main-window.c.debug	2008-04-07 05:30:43.000000000 +0900
+++ pcmanfm-0.3.9.98/src/main-window.c	2008-04-12 23:17:07.000000000 +0900
@@ -1590,7 +1590,7 @@
 
     cmd_line = g_strdup_printf( "%s --no-desktop '%s'", g_get_prgname(), cwd );
 
-    if( ! vfs_sudo_cmd_async( cwd, cmd_line, err ) )
+    if( ! vfs_sudo_cmd_async( cwd, cmd_line, &err ) )
     {
         ptk_show_error( GTK_WINDOW( main_window ), _("Error"), err->message );
         g_error_free( err );
--- pcmanfm-0.3.9.98/src/main.c.debug	2008-04-07 00:15:15.000000000 +0900
+++ pcmanfm-0.3.9.98/src/main.c	2008-04-12 23:55:01.000000000 +0900
@@ -39,6 +39,8 @@
 
 #include "ptk-utils.h"
 #include "ptk-app-chooser.h"
+#include "ptk-file-menu.h"
+#include "ptk-file-properties.h"
 
 #include "settings.h"
 
--- pcmanfm-0.3.9.98/src/pref-dialog.c.debug	2008-04-07 00:15:15.000000000 +0900
+++ pcmanfm-0.3.9.98/src/pref-dialog.c	2008-04-13 00:04:37.000000000 +0900
@@ -20,6 +20,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "desktop.h"
+
 #include "pref-dialog.h"
 #include "settings.h"
 #include "ptk-ui-xml.h"
@@ -289,7 +291,7 @@
     vfs_dir_unload_thumbnails( dir, (gboolean)user_data );
 }
 
-gboolean fm_edit_preference( GtkWindow* parent, int page )
+void fm_edit_preference( GtkWindow* parent, int page )
 {
     int max_thumb = app_settings.max_thumb_size;
     gboolean show_thumbnails = app_settings.show_thumbnail;
--- pcmanfm-0.3.9.98/src/pref-dialog.h.debug	2008-04-07 00:15:15.000000000 +0900
+++ pcmanfm-0.3.9.98/src/pref-dialog.h	2008-04-13 00:05:05.000000000 +0900
@@ -10,7 +10,7 @@
     PREF_DESKTOP
 }PrefDlgPage;
 
-gboolean fm_edit_preference( GtkWindow* parent, int page );
+void fm_edit_preference( GtkWindow* parent, int page );
 
 G_END_DECLS
 
--- pcmanfm-0.3.9.98/src/ptk/ptk-file-menu.c.debug	2008-04-07 00:15:07.000000000 +0900
+++ pcmanfm-0.3.9.98/src/ptk/ptk-file-menu.c	2008-04-12 23:32:01.000000000 +0900
@@ -45,7 +45,7 @@
     GtkAccelGroup *accel_group;
 };
 
-#define get_toplevel_win(data)  ( (GtkWindow*) (data->browser ? ( gtk_widget_get_toplevel((GtkWidget*) data->browser) ) : NULL) )
+#define get_toplevel_win(data)  ( (data->browser ? ( gtk_widget_get_toplevel((GtkWidget*) data->browser) ) : NULL) )
 
 /* Signal handlers for popup menu */
 static void
@@ -476,7 +476,7 @@
         mime_type = vfs_mime_type_get_from_type( XDG_MIME_TYPE_DIRECTORY );
     }
 
-    app = (char *) ptk_choose_app_for_mime_type( get_toplevel_win(data),  mime_type );
+    app = (char *) ptk_choose_app_for_mime_type( GTK_WINDOW(get_toplevel_win(data)),  mime_type );
     if ( app )
     {
         GList* sel_files = data->sel_files;
--- pcmanfm-0.3.9.98/src/settings.c.debug	2008-04-07 04:17:50.000000000 +0900
+++ pcmanfm-0.3.9.98/src/settings.c	2008-04-13 00:00:20.000000000 +0900
@@ -26,7 +26,7 @@
 /* Dirty hack: check whether we are under LXDE or not */
 #define is_under_LXDE()     (g_getenv( "_LXSESSION_PID" ) != NULL)
 
-AppSettings app_settings = {0};
+AppSettings app_settings = {{0}};
 /* const gboolean singleInstance_default = TRUE; */
 const gboolean show_hidden_files_default = FALSE;
 const gboolean show_side_pane_default = TRUE;


Index: pcmanfm.spec
===================================================================
RCS file: /cvs/extras/rpms/pcmanfm/devel/pcmanfm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pcmanfm.spec	8 Apr 2008 18:51:20 -0000	1.10
+++ pcmanfm.spec	12 Apr 2008 17:04:47 -0000	1.11
@@ -3,13 +3,14 @@
 
 Name:		pcmanfm
 Version:	0.3.9.98
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Extremly fast and lightweight file manager
 
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://pcmanfm.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz
+Patch0:		pcmanfm-0.3.9.98-try-supress-warning.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	dbus-glib-devel
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .debug
 
 # permission fix
 %{__chmod} 0644 \
@@ -91,6 +93,10 @@
 %{_datadir}/mime/packages/*.xml
 
 %changelog
+* Sun Apr 13 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.9.98-2
+- First trial to suppress compilation warning (containing fix for
+  crash on an occasion)
+
 * Wed Apr  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.9.98-1
 - 0.3.9.98
 




More information about the fedora-extras-commits mailing list