1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
Fix build with GCC 4.5, fix random SIGSEGV
http://bugs.gentoo.org/show_bug.cgi?id=322211
https://bugzilla.redhat.com/show_bug.cgi?id=454045
--- a/geo/drgeo_figure.h
+++ b/geo/drgeo_figure.h
@@ -322,4 +322,11 @@
gboolean showGrid;
};
+struct
+{
+ drgeoPoint mouse;
+ drgeoFigure *figure;
+}
+drgeoDialogData;
+
#endif
--- a/geo/drgeo_figure.cc
+++ b/geo/drgeo_figure.cc
@@ -48,13 +48,6 @@
#include "drgeo_dialog.h"
#include "traite.h"
-extern struct
-{
- drgeoPoint mouse;
- drgeoFigure *figure;
-}
-drgeoDialogData;
-
typedef struct drgeoSearchValue
{
gpointer value;
@@ -1309,7 +1302,7 @@
gint
drgeoFigure::preferedUndoLevel ()
{
- atoi (drgeoConfigGet (":undoLevel"));
+ return atoi (drgeoConfigGet (":undoLevel"));
}
void
--- a/geo/drgeo_dialog.cc
+++ b/geo/drgeo_dialog.cc
@@ -38,14 +38,6 @@
// Used in the style dialod callback, I know it's ugly, but so easy
static drgeoFigure *selected_figure;
-struct
-{
- drgeoPoint mouse;
- drgeoFigure *figure;
-}
-drgeoDialogData;
-
-
static void drgeo_edit_dialog_cb (GtkWidget * dialog,
gint button, gpointer entry);
|
GitWeb
