diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2006-08-22 15:47:27 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2006-08-22 15:47:27 +0000 |
| commit | 92415076b9a7601cec26eea72f9a6b6ac2ee848f (patch) | |
| tree | 37bde38e5e6652db3ba4da9381fb1dc18fb3aa25 | |
| parent | 2f47add9ac03120f77cb0115215dbc473e9853f4 (diff) | |
gpe-screenshot: Add fix for segfault uploading files in current release.
| -rw-r--r-- | packages/gpe-screenshot/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/gpe-screenshot/files/fix-segfault.patch | 36 | ||||
| -rw-r--r-- | packages/gpe-screenshot/gpe-screenshot_0.4.bb | 3 |
3 files changed, 39 insertions, 0 deletions
diff --git a/packages/gpe-screenshot/files/.mtn2git_empty b/packages/gpe-screenshot/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpe-screenshot/files/.mtn2git_empty diff --git a/packages/gpe-screenshot/files/fix-segfault.patch b/packages/gpe-screenshot/files/fix-segfault.patch new file mode 100644 index 0000000000..dc185a9b51 --- /dev/null +++ b/packages/gpe-screenshot/files/fix-segfault.patch @@ -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); diff --git a/packages/gpe-screenshot/gpe-screenshot_0.4.bb b/packages/gpe-screenshot/gpe-screenshot_0.4.bb index 283d28d5aa..b64bdceb04 100644 --- a/packages/gpe-screenshot/gpe-screenshot_0.4.bb +++ b/packages/gpe-screenshot/gpe-screenshot_0.4.bb @@ -3,7 +3,10 @@ LICENSE = "GPL" PRIORITY = "optional" MAINTAINER = "Rene Wagner <rw@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 " |