[oe-commits] org.oe.oz354x gpe-screenshot: Add patch to fix segfault uploading files in current release.

[florian commit]

gpe-screenshot: Add patch to fix segfault uploading files in current release.

Author: florian at openembedded.org
Branch: org.openembedded.oz354x
Revision: ba209c9f29aa35fa2b6707faeab82a43b6429212
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ba209c9f29aa35fa2b6707faeab82a43b6429212
Files:
1
packages/gpe-screenshot/files
packages/gpe-screenshot/files/fix-segfault.patch
packages/gpe-screenshot/gpe-screenshot_0.4.bb
Diffs:

#
# mt diff -rd2658c578fc57137cc3475ff80c59f022813df57 -rba209c9f29aa35fa2b6707faeab82a43b6429212
#
# 
# 
# add_dir "packages/gpe-screenshot/files"
# 
# add_file "packages/gpe-screenshot/files/fix-segfault.patch"
#  content [df6dd3dca4f76c3e883284c694912e6d436c8537]
# 
# patch "packages/gpe-screenshot/gpe-screenshot_0.4.bb"
#  from [d667a6aee4bb9ab3273aba0bc87e63a65578c6f6]
#    to [408a09e3d2c93334ad70b4c5399c59b3ddcfb737]
# 
============================================================
--- packages/gpe-screenshot/files/fix-segfault.patch	df6dd3dca4f76c3e883284c694912e6d436c8537
+++ packages/gpe-screenshot/files/fix-segfault.patch	df6dd3dca4f76c3e883284c694912e6d436c8537
@@ -0,0 +1,36 @@
+Index: src/gpe-screenshot.c
+===================================================================
+RCS file: /cvs/gpe/base/gpe-screenshot/src/gpe-screenshot.c,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- src/gpe-screenshot.c	1 Nov 2005 20:54:38 -0000	1.1
++++ src/gpe-screenshot.c	10 Aug 2006 15:07:21 -0000	1.2
+@@ -334,10 +334,9 @@
+     {
+       GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_BUTTON);
+ 
+-      g_object_set (mainDlg->ok_button, "use-stock", FALSE);
+-      g_object_set (mainDlg->ok_button, "use-underline", TRUE);
+-      g_object_set (mainDlg->ok_button, "label", "_Upload");
+-      g_object_set (mainDlg->ok_button, "image", GTK_WIDGET (icon));
++      gtk_button_set_use_stock (mainDlg->ok_button, FALSE);
++      gtk_button_set_label (mainDlg->ok_button, "_Upload");
++      gtk_button_set_image (mainDlg->ok_button, icon);
+ 
+       gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->entry), FALSE);
+       gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->browse_button), FALSE);
+@@ -347,10 +346,9 @@
+       GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_SAVE, GTK_ICON_SIZE_BUTTON);
+ 
+       /* for some odd reason use-stock doesn't have any effect. set the image manually...*/
+-      g_object_set (mainDlg->ok_button, "use-stock", TRUE);
+-      g_object_set (mainDlg->ok_button, "use-underline", TRUE);
+-      g_object_set (mainDlg->ok_button, "label", GTK_STOCK_SAVE);
+-      g_object_set (mainDlg->ok_button, "image", GTK_WIDGET (icon));
++      gtk_button_set_label (mainDlg->ok_button, GTK_STOCK_SAVE);
++      gtk_button_set_use_stock (mainDlg->ok_button, TRUE);
++      gtk_button_set_image (mainDlg->ok_button, icon);
+ 
+       gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->entry), TRUE);
+       gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->browse_button), TRUE);
============================================================
--- packages/gpe-screenshot/gpe-screenshot_0.4.bb	d667a6aee4bb9ab3273aba0bc87e63a65578c6f6
+++ packages/gpe-screenshot/gpe-screenshot_0.4.bb	408a09e3d2c93334ad70b4c5399c59b3ddcfb737
@@ -1,9 +1,12 @@ SECTION = "gpe"
 DESCRIPTION = "GPE screenshot application"
 LICENSE = "GPL"
 PRIORITY = "optional"
 MAINTAINER = "Rene Wagner <rw at handhelds.org>"
 SECTION = "gpe"
+PR = "r1"
 
 DEPENDS = "glib-2.0 gtk+ libglade"
 
 inherit gpe autotools
+
+SRC_URI += "file://fix-segfault.patch;patch=1;pnum=0 "