Package: acedb / 4.9.39+dfsg.02-5

blxview_gtk_namespace_conflict.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
Description: Adapt to current version of gtk

--- a/w9/blxview.c
+++ b/w9/blxview.c
@@ -3447,7 +3447,7 @@ static char *getSeq(char *seqname, char
 /********************************************************************************
 **                            BIG PICTURE ROUTINES                            ***
 ********************************************************************************/
-static void GSettings(GtkButton *button, gpointer args)
+static void blixemGSettings(GtkButton *button, gpointer args)   // namespace conflict, there is "typedef struct _GSettings GSettings;" in /usr/include/glib-2.0/gio/giotypes.h
 {
   blixemSettings();
 }
@@ -3583,7 +3583,7 @@ static GtkWidget *makeButtonBar(void)
   item = makeNewToolbarButton(GTK_TOOLBAR(toolbar),
 			      "Settings",
 			      "Open the Preferences Window",
-			      (GtkSignalFunc)GSettings) ;
+			      (GtkSignalFunc)blixemGSettings) ;
 
   item = makeNewToolbarButton(GTK_TOOLBAR(toolbar),
 			      "Goto", "Go to specified co-ordinates",