]>
Commit | Line | Data |
---|---|---|
f9d03d58 JR |
1 | --- abiword-2.8.6/src/af/xap/gtk/xap_UnixDialogHelper.cpp~ 2010-02-06 20:34:36.000000000 +0100 |
2 | +++ abiword-2.8.6/src/af/xap/gtk/xap_UnixDialogHelper.cpp 2012-11-12 22:38:11.229320473 +0100 | |
3 | @@ -830,7 +830,7 @@ | |
4 | GTK_DIALOG_MODAL, | |
5 | GTK_MESSAGE_INFO, | |
6 | GTK_BUTTONS_OK, | |
7 | - message ) ; | |
8 | + "%s", message ) ; | |
9 | ||
10 | gtk_window_set_title(GTK_WINDOW(msg), "AbiWord"); | |
11 | gtk_window_set_role(GTK_WINDOW(msg), "message dialog"); | |
12 | --- abiword-2.8.6/src/af/xap/gtk/xap_UnixDlg_Image.cpp~ 2009-06-07 03:36:47.000000000 +0200 | |
13 | +++ abiword-2.8.6/src/af/xap/gtk/xap_UnixDlg_Image.cpp 2012-11-12 22:40:08.589316335 +0100 | |
14 | @@ -488,7 +488,7 @@ | |
15 | ||
16 | std::string s; | |
17 | pSS->getValueUTF8(XAP_STRING_ID_DLG_Image_Title,s); | |
18 | - abiDialogSetTitle(mMainWindow, s.c_str()); | |
19 | + abiDialogSetTitle(mMainWindow, "%s", s.c_str()); | |
20 | ||
21 | localizeLabel(GTK_WIDGET(gtk_builder_get_object(builder, "lbDescTab")), pSS, XAP_STRING_ID_DLG_Image_DescTabLabel); | |
22 | localizeLabel(GTK_WIDGET(gtk_builder_get_object(builder, "lbWrapTab")), pSS, XAP_STRING_ID_DLG_Image_WrapTabLabel); | |
23 | --- abiword-2.8.6/src/af/xap/gtk/xap_UnixDlg_Zoom.cpp~ 2008-08-16 09:13:53.000000000 +0200 | |
24 | +++ abiword-2.8.6/src/af/xap/gtk/xap_UnixDlg_Zoom.cpp 2012-11-12 22:41:17.615980564 +0100 | |
25 | @@ -225,7 +225,7 @@ | |
26 | // set the dialog title | |
27 | UT_UTF8String s; | |
28 | pSS->getValueUTF8(XAP_STRING_ID_DLG_Zoom_ZoomTitle,s); | |
29 | - abiDialogSetTitle(window, s.utf8_str()); | |
30 | + abiDialogSetTitle(window, "%s", s.utf8_str()); | |
31 | ||
32 | // localize the strings in our dialog, and set tags for some widgets | |
33 | ||
34 | --- abiword-2.8.6/src/af/xap/xp/xap_Prefs.cpp~ 2010-02-06 21:50:16.000000000 +0100 | |
35 | +++ abiword-2.8.6/src/af/xap/xp/xap_Prefs.cpp 2012-11-12 22:44:12.825974385 +0100 | |
36 | @@ -1286,37 +1286,37 @@ | |
37 | if (XAP_App::s_szBuild_ID && XAP_App::s_szBuild_ID[0]) | |
38 | { | |
39 | fprintf(fp,"<!-- Build_ID = "); | |
40 | - fprintf(fp,XAP_App::s_szBuild_ID); | |
41 | + fprintf(fp,"%s", XAP_App::s_szBuild_ID); | |
42 | fprintf(fp," -->\n"); | |
43 | } | |
44 | if (XAP_App::s_szBuild_Version && XAP_App::s_szBuild_Version[0]) | |
45 | { | |
46 | fprintf(fp,"<!-- Build_Version = "); | |
47 | - fprintf(fp,XAP_App::s_szBuild_Version); | |
48 | + fprintf(fp,"%s", XAP_App::s_szBuild_Version); | |
49 | fprintf(fp," -->\n"); | |
50 | } | |
51 | if (XAP_App::s_szBuild_Options && XAP_App::s_szBuild_Options[0]) | |
52 | { | |
53 | fprintf(fp,"<!-- Build_Options = "); | |
54 | - fprintf(fp,XAP_App::s_szBuild_Options); | |
55 | + fprintf(fp,"%s", XAP_App::s_szBuild_Options); | |
56 | fprintf(fp," -->\n"); | |
57 | } | |
58 | if (XAP_App::s_szBuild_Target && XAP_App::s_szBuild_Target[0]) | |
59 | { | |
60 | fprintf(fp,"<!-- Build_Target = "); | |
61 | - fprintf(fp,XAP_App::s_szBuild_Target); | |
62 | + fprintf(fp,"%s", XAP_App::s_szBuild_Target); | |
63 | fprintf(fp," -->\n"); | |
64 | } | |
65 | if (XAP_App::s_szBuild_CompileTime && XAP_App::s_szBuild_CompileTime[0]) | |
66 | { | |
67 | fprintf(fp,"<!-- Build_CompileTime = "); | |
68 | - fprintf(fp,XAP_App::s_szBuild_CompileTime); | |
69 | + fprintf(fp,"%s", XAP_App::s_szBuild_CompileTime); | |
70 | fprintf(fp," -->\n"); | |
71 | } | |
72 | if (XAP_App::s_szBuild_CompileDate && XAP_App::s_szBuild_CompileDate[0]) | |
73 | { | |
74 | fprintf(fp,"<!-- Build_CompileDate = "); | |
75 | - fprintf(fp,XAP_App::s_szBuild_CompileDate); | |
76 | + fprintf(fp,"%s", XAP_App::s_szBuild_CompileDate); | |
77 | fprintf(fp," -->\n"); | |
78 | } | |
79 | #endif | |
80 | --- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Annotation.cpp~ 2009-08-06 03:35:51.000000000 +0200 | |
81 | +++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Annotation.cpp 2012-11-12 22:46:13.629303456 +0100 | |
82 | @@ -165,7 +165,7 @@ | |
83 | // set the dialog title | |
84 | std::string s; | |
85 | pSS->getValueUTF8(AP_STRING_ID_DLG_Annotation_Title,s); | |
86 | - abiDialogSetTitle(window, s.c_str()); | |
87 | + abiDialogSetTitle(window, "%s", s.c_str()); | |
88 | ||
89 | // localize the strings in our dialog, and set some userdata for some widgets | |
90 | localizeLabel(GTK_WIDGET(gtk_builder_get_object(builder, "lbTitle")), pSS, AP_STRING_ID_DLG_Annotation_Title_LBL); | |
91 | --- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Break.cpp~ 2009-06-03 09:31:03.000000000 +0200 | |
92 | +++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Break.cpp 2012-11-12 22:46:33.815969411 +0100 | |
93 | @@ -109,7 +109,7 @@ | |
94 | // set the dialog title | |
95 | UT_UTF8String s; | |
96 | pSS->getValueUTF8(AP_STRING_ID_DLG_Break_BreakTitle_Capital,s); | |
97 | - abiDialogSetTitle(window, s.utf8_str()); | |
98 | + abiDialogSetTitle(window, "%s", s.utf8_str()); | |
99 | ||
100 | // localize the strings in our dialog, and set tags for some widgets | |
101 | ||
102 | --- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Field.cpp~ 2009-06-03 09:31:03.000000000 +0200 | |
103 | +++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Field.cpp 2012-11-12 22:46:54.355968686 +0100 | |
104 | @@ -297,7 +297,7 @@ | |
105 | // set the dialog title | |
106 | UT_UTF8String s; | |
107 | pSS->getValueUTF8(AP_STRING_ID_DLG_Field_FieldTitle_Capital,s); | |
108 | - abiDialogSetTitle(window, s.utf8_str()); | |
109 | + abiDialogSetTitle(window, "%s", s.utf8_str()); | |
110 | ||
111 | // localize the strings in our dialog, and set some userdata for some widg | |
112 | ||
113 | --- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_FormatFootnotes.cpp~ 2009-06-03 09:31:03.000000000 +0200 | |
114 | +++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_FormatFootnotes.cpp 2012-11-12 22:47:15.865967928 +0100 | |
115 | @@ -372,7 +372,7 @@ | |
116 | // set the dialog title | |
117 | std::string s; | |
118 | pSS->getValueUTF8(AP_STRING_ID_DLG_FormatFootnotes_Title,s); | |
119 | - abiDialogSetTitle(window, s.c_str()); | |
120 | + abiDialogSetTitle(window, "%s", s.c_str()); | |
121 | ||
122 | // localize the strings in our dialog, and set tags for some widgets | |
123 | ||
124 | --- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_FormatFrame.cpp~ 2009-07-20 18:25:01.000000000 +0200 | |
125 | +++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_FormatFrame.cpp 2012-11-12 22:47:39.452633762 +0100 | |
126 | @@ -476,7 +476,7 @@ | |
127 | ||
128 | // set the dialog title | |
129 | ConstructWindowName(); | |
130 | - abiDialogSetTitle(window, m_WindowName); | |
131 | + abiDialogSetTitle(window, "%s", m_WindowName); | |
132 | ||
133 | // disable double buffering on our preview | |
134 | gtk_widget_set_double_buffered(m_wPreviewArea, FALSE); | |
135 | --- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_FormatTable.cpp~ 2009-07-30 22:53:31.000000000 +0200 | |
136 | +++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_FormatTable.cpp 2012-11-12 22:48:01.205966328 +0100 | |
137 | @@ -437,7 +437,7 @@ | |
138 | ||
139 | // set the dialog title | |
140 | ConstructWindowName(); | |
141 | - abiDialogSetTitle(window, m_WindowName); | |
142 | + abiDialogSetTitle(window, "%s", m_WindowName); | |
143 | ||
144 | // disable double buffering on our preview | |
145 | gtk_widget_set_double_buffered(m_wPreviewArea, FALSE); | |
146 | --- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_FormatTOC.cpp~ 2009-06-03 09:31:03.000000000 +0200 | |
147 | +++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_FormatTOC.cpp 2012-11-12 22:48:20.275965655 +0100 | |
148 | @@ -361,7 +361,7 @@ | |
149 | // set the dialog title | |
150 | UT_UTF8String s; | |
151 | pSS->getValueUTF8(AP_STRING_ID_DLG_FormatTOC_Title,s); | |
152 | - abiDialogSetTitle(m_windowMain, s.utf8_str()); | |
153 | + abiDialogSetTitle(m_windowMain, "%s", s.utf8_str()); | |
154 | ||
155 | // localize notebook tabs | |
156 | localizeLabel(_getWidget( "lbGeneral"), pSS, AP_STRING_ID_DLG_FormatTOC_General); | |
157 | --- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_HdrFtr.cpp~ 2009-06-03 09:31:03.000000000 +0200 | |
158 | +++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_HdrFtr.cpp 2012-11-12 22:48:41.055964921 +0100 | |
159 | @@ -203,7 +203,7 @@ | |
160 | // set the dialog title | |
161 | UT_UTF8String s; | |
162 | pSS->getValueUTF8(AP_STRING_ID_DLG_HdrFtr_Title,s); | |
163 | - abiDialogSetTitle(window, s.utf8_str()); | |
164 | + abiDialogSetTitle(window, "%s", s.utf8_str()); | |
165 | ||
166 | // localize the strings in our dialog | |
167 | ||
168 | --- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Insert_DateTime.cpp~ 2009-06-03 09:31:03.000000000 +0200 | |
169 | +++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Insert_DateTime.cpp 2012-11-12 22:49:15.639297036 +0100 | |
170 | @@ -145,7 +145,7 @@ | |
171 | // set the dialog title | |
172 | UT_UTF8String s; | |
173 | pSS->getValueUTF8(AP_STRING_ID_DLG_DateTime_DateTimeTitle,s); | |
174 | - abiDialogSetTitle(window, s.utf8_str()); | |
175 | + abiDialogSetTitle(window, "%s", s.utf8_str()); | |
176 | ||
177 | // localize the strings in our dialog | |
178 | ||
179 | --- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_InsertTable.cpp~ 2009-06-03 04:38:41.000000000 +0200 | |
180 | +++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_InsertTable.cpp 2012-11-12 22:50:14.005961642 +0100 | |
181 | @@ -127,7 +127,7 @@ | |
182 | // set the dialog title | |
183 | std::string s; | |
184 | pSS->getValueUTF8(AP_STRING_ID_DLG_InsertTable_TableTitle,s); | |
185 | - abiDialogSetTitle(window, s.c_str()); | |
186 | + abiDialogSetTitle(window, "%s", s.c_str()); | |
187 | // Units | |
188 | gtk_label_set_text (GTK_LABEL (GTK_WIDGET(gtk_builder_get_object(builder, "lbInch"))), UT_dimensionName(m_dim)); | |
189 | double spinstep = getSpinIncr (); | |
190 | --- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_MailMerge.cpp~ 2008-11-22 18:47:06.000000000 +0100 | |
191 | +++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_MailMerge.cpp 2012-11-12 22:50:32.412627659 +0100 | |
192 | @@ -173,7 +173,7 @@ | |
193 | // set the dialog title | |
194 | UT_UTF8String s; | |
195 | pSS->getValueUTF8(AP_STRING_ID_DLG_MailMerge_MailMergeTitle,s); | |
196 | - abiDialogSetTitle(m_windowMain, s.utf8_str()); | |
197 | + abiDialogSetTitle(m_windowMain, "%s", s.utf8_str()); | |
198 | ||
199 | // localize the strings in our dialog, and set tags for some widgets | |
200 | ||
201 | --- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_MetaData.cpp~ 2008-08-16 09:13:53.000000000 +0200 | |
202 | +++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_MetaData.cpp 2012-11-12 22:51:13.505959544 +0100 | |
203 | @@ -155,7 +155,7 @@ | |
204 | // set the dialog title | |
205 | UT_UTF8String s; | |
206 | pSS->getValueUTF8(AP_STRING_ID_DLG_MetaData_Title,s); | |
207 | - abiDialogSetTitle(window, s.utf8_str()); | |
208 | + abiDialogSetTitle(window, "%s", s.utf8_str()); | |
209 | ||
210 | // localize the strings in our dialog, and set some userdata for some widgets | |
211 | localizeLabel(GTK_WIDGET(gtk_builder_get_object(builder, "lbTitle")), pSS, AP_STRING_ID_DLG_MetaData_Title_LBL); | |
212 | --- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Options.cpp~ 2009-07-03 19:17:25.000000000 +0200 | |
213 | +++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Options.cpp 2012-11-12 22:51:45.839291734 +0100 | |
214 | @@ -208,7 +208,7 @@ | |
215 | ||
216 | dlg = WID ( "ap_UnixDialog_Options_ColorSel" ); | |
217 | pSS->getValueUTF8 ( AP_STRING_ID_DLG_Options_Label_ChooseForTransparent, s ); | |
218 | - abiDialogSetTitle ( dlg, s.utf8_str() ); | |
219 | + abiDialogSetTitle ( dlg, "%s", s.utf8_str() ); | |
220 | ||
221 | colorsel = WID ( "csColorSel" ); | |
222 | ||
223 | @@ -529,7 +529,7 @@ | |
224 | // set the dialog title | |
225 | std::string s; | |
226 | pSS->getValueUTF8(AP_STRING_ID_DLG_Options_OptionsTitle, s); | |
227 | - abiDialogSetTitle(mainWindow, s.c_str()); | |
228 | + abiDialogSetTitle(mainWindow, "%s", s.c_str()); | |
229 | ||
230 | // the control buttons | |
231 | g_signal_connect ( G_OBJECT ( m_buttonDefaults ), | |
232 | --- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_PageNumbers.cpp~ 2009-06-03 09:31:03.000000000 +0200 | |
233 | +++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_PageNumbers.cpp 2012-11-12 22:52:01.915957837 +0100 | |
234 | @@ -172,7 +172,7 @@ | |
235 | // set the dialog title | |
236 | UT_UTF8String s; | |
237 | pSS->getValueUTF8(AP_STRING_ID_DLG_PageNumbers_Title,s); | |
238 | - abiDialogSetTitle(window, s.utf8_str()); | |
239 | + abiDialogSetTitle(window, "%s", s.utf8_str()); | |
240 | ||
241 | // disable double buffering on our preview | |
242 | gtk_widget_set_double_buffered(m_previewArea, FALSE); | |
243 | --- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Stylist.cpp~ 2009-06-01 07:25:31.000000000 +0200 | |
244 | +++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Stylist.cpp 2012-11-12 22:52:25.832623658 +0100 | |
245 | @@ -274,7 +274,7 @@ | |
246 | // set the dialog title | |
247 | UT_UTF8String s; | |
248 | pSS->getValueUTF8(AP_STRING_ID_DLG_Stylist_Title,s); | |
249 | - abiDialogSetTitle(m_windowMain, s.utf8_str()); | |
250 | + abiDialogSetTitle(m_windowMain, "%s", s.utf8_str()); | |
251 | ||
252 | g_object_unref(G_OBJECT(builder)); | |
253 | ||
fb9b327b JR |
254 | --- abiword-2.8.6/goffice-bits/goffice/gtk/goffice-gtk.c~ 2008-08-14 20:15:33.000000000 +0200 |
255 | +++ abiword-2.8.6/goffice-bits/goffice/gtk/goffice-gtk.c 2012-11-20 20:37:47.832386344 +0100 | |
256 | @@ -853,7 +853,7 @@ | |
257 | GTK_DIALOG_DESTROY_WITH_PARENT, | |
258 | GTK_MESSAGE_WARNING, | |
259 | GTK_BUTTONS_OK_CANCEL, | |
260 | - msg); | |
261 | + "%s", msg); | |
262 | gtk_dialog_set_default_response (GTK_DIALOG (dialog), | |
263 | overwrite_by_default ? GTK_RESPONSE_OK : GTK_RESPONSE_CANCEL); | |
264 | result = GTK_RESPONSE_OK == |