]>
Commit | Line | Data |
---|---|---|
53ebc04a JR |
1 | --- xfce4-notes-plugin-1.8.1/lib/application.c.orig 2015-06-24 21:29:20.000000000 +0000 |
2 | +++ xfce4-notes-plugin-1.8.1/lib/application.c 2018-06-10 21:06:59.540406849 +0000 | |
3 | @@ -341,7 +341,6 @@ | |
4 | _tmp7_ = dir; | |
5 | _tmp8_ = g_dir_read_name (_tmp7_); | |
6 | if (_tmp8_ != NULL) { | |
7 | - const gchar* _tmp9_ = NULL; | |
8 | GtkMessageDialog* _tmp10_; | |
9 | GtkMessageDialog* error_dialog; | |
10 | GtkMessageDialog* _tmp11_; | |
11 | @@ -351,8 +350,7 @@ | |
12 | GtkMessageDialog* _tmp15_; | |
13 | XfconfChannel* _tmp16_; | |
14 | const gchar* _tmp17_; | |
15 | - _tmp9_ = _ ("Select notes path"); | |
16 | - _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp9_); | |
17 | + _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Select notes path")); | |
18 | g_object_ref_sink (_tmp10_); | |
19 | error_dialog = _tmp10_; | |
20 | _tmp11_ = error_dialog; | |
21 | @@ -407,7 +405,6 @@ | |
22 | } | |
23 | _tmp26_ = _tmp20_; | |
24 | if (_tmp26_) { | |
25 | - const gchar* _tmp27_ = NULL; | |
26 | GtkMessageDialog* _tmp28_; | |
27 | GtkMessageDialog* error_dialog; | |
28 | GtkMessageDialog* _tmp29_; | |
29 | @@ -418,8 +415,7 @@ | |
30 | GtkMessageDialog* _tmp34_; | |
31 | XfconfChannel* _tmp35_; | |
32 | const gchar* _tmp36_; | |
33 | - _tmp27_ = _ ("Select notes path"); | |
34 | - _tmp28_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp27_); | |
35 | + _tmp28_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Select notes path")); | |
36 | g_object_ref_sink (_tmp28_); | |
37 | error_dialog = _tmp28_; | |
38 | _tmp29_ = error_dialog; | |
39 | @@ -1964,16 +1960,12 @@ | |
40 | _tmp28_ = xnp_application_window_name_exists (self, _tmp27_); | |
41 | if (_tmp28_) { | |
42 | XnpWindow* _tmp29_; | |
43 | - const gchar* _tmp30_ = NULL; | |
44 | - const gchar* _tmp31_; | |
45 | GtkMessageDialog* _tmp32_; | |
46 | GtkMessageDialog* error_dialog; | |
47 | GtkMessageDialog* _tmp33_; | |
48 | GtkMessageDialog* _tmp34_; | |
49 | _tmp29_ = window; | |
50 | - _tmp30_ = _ ("The name %s is already in use"); | |
51 | - _tmp31_ = name; | |
52 | - _tmp32_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp29_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp30_, _tmp31_); | |
53 | + _tmp32_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp29_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("The name %s is already in use"), name); | |
54 | g_object_ref_sink (_tmp32_); | |
55 | error_dialog = _tmp32_; | |
56 | _tmp33_ = error_dialog; | |
57 | @@ -2072,7 +2064,6 @@ | |
58 | _tmp2_ = _tmp1_; | |
59 | if (_tmp2_ >= 1) { | |
60 | XnpWindow* _tmp3_; | |
61 | - const gchar* _tmp4_ = NULL; | |
62 | GtkMessageDialog* _tmp5_; | |
63 | GtkMessageDialog* dialog; | |
64 | GtkMessageDialog* _tmp6_; | |
65 | @@ -2081,8 +2072,7 @@ | |
66 | GtkMessageDialog* _tmp8_; | |
67 | gint _tmp9_; | |
68 | _tmp3_ = window; | |
69 | - _tmp4_ = _ ("Are you sure you want to delete this group?"); | |
70 | - _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp3_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _tmp4_); | |
71 | + _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp3_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("Are you sure you want to delete this group?")); | |
72 | g_object_ref_sink (_tmp5_); | |
73 | dialog = _tmp5_; | |
74 | _tmp6_ = dialog; | |
75 | @@ -2220,10 +2210,7 @@ | |
76 | */ | |
77 | static void xnp_application_refresh_notes (XnpApplication* self, XnpWindow* window) { | |
78 | XnpWindow* _tmp0_; | |
79 | - const gchar* _tmp1_ = NULL; | |
80 | XnpWindow* _tmp2_; | |
81 | - const gchar* _tmp3_; | |
82 | - const gchar* _tmp4_; | |
83 | GtkMessageDialog* _tmp5_; | |
84 | GtkMessageDialog* dialog; | |
85 | GtkMessageDialog* _tmp6_; | |
86 | @@ -2241,11 +2228,8 @@ | |
87 | g_return_if_fail (self != NULL); | |
88 | g_return_if_fail (window != NULL); | |
89 | _tmp0_ = window; | |
90 | - _tmp1_ = _ ("The group \"%s\" has been modified on the disk"); | |
91 | _tmp2_ = window; | |
92 | - _tmp3_ = xnp_window_get_name (_tmp2_); | |
93 | - _tmp4_ = _tmp3_; | |
94 | - _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp0_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _tmp1_, _tmp4_); | |
95 | + _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp0_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("The group \"%s\" has been modified on the disk"), xnp_window_get_name (_tmp2_)); | |
96 | g_object_ref_sink (_tmp5_); | |
97 | dialog = _tmp5_; | |
98 | _tmp6_ = dialog; | |
99 | @@ -2559,8 +2543,6 @@ | |
100 | res = _tmp1_; | |
101 | _tmp2_ = res; | |
102 | if (!_tmp2_) { | |
103 | - const gchar* _tmp3_ = NULL; | |
104 | - const gchar* _tmp4_; | |
105 | GtkMessageDialog* _tmp5_; | |
106 | GtkMessageDialog* error_dialog; | |
107 | GtkMessageDialog* _tmp6_; | |
108 | @@ -2569,9 +2551,7 @@ | |
109 | gchar* _tmp9_; | |
110 | GtkMessageDialog* _tmp10_; | |
111 | GtkMessageDialog* _tmp11_; | |
112 | - _tmp3_ = _ ("The name \"%s\" is invalid."); | |
113 | - _tmp4_ = name; | |
114 | - _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp3_, _tmp4_); | |
115 | + _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("The name \"%s\" is invalid."), name); | |
116 | g_object_ref_sink (_tmp5_); | |
117 | error_dialog = _tmp5_; | |
118 | _tmp6_ = error_dialog; | |
119 | @@ -2710,7 +2690,6 @@ | |
120 | __catch10_g_error: | |
121 | { | |
122 | GError* e = NULL; | |
123 | - const gchar* _tmp0_ = NULL; | |
124 | GtkMessageDialog* _tmp1_; | |
125 | GtkMessageDialog* error_dialog; | |
126 | GtkMessageDialog* _tmp2_; | |
127 | @@ -2720,8 +2699,7 @@ | |
128 | GtkMessageDialog* _tmp6_; | |
129 | e = _inner_error_; | |
130 | _inner_error_ = NULL; | |
131 | - _tmp0_ = _ ("Unable to open the settings dialog"); | |
132 | - _tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp0_); | |
133 | + _tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Unable to open the settings dialog")); | |
134 | g_object_ref_sink (_tmp1_); | |
135 | error_dialog = _tmp1_; | |
136 | _tmp2_ = error_dialog; | |
137 | --- xfce4-notes-plugin-1.8.1/lib/window.c~ 2015-06-24 21:29:20.000000000 +0000 | |
138 | +++ xfce4-notes-plugin-1.8.1/lib/window.c 2018-06-10 21:08:16.583650155 +0000 | |
139 | @@ -3533,7 +3533,6 @@ | |
140 | _tmp7_ = _tmp6_; | |
141 | _tmp8_ = gtk_text_buffer_get_char_count (_tmp7_); | |
142 | if (_tmp8_ > 0) { | |
143 | - const gchar* _tmp9_ = NULL; | |
144 | GtkMessageDialog* _tmp10_; | |
145 | GtkMessageDialog* dialog; | |
146 | GtkMessageDialog* _tmp11_; | |
147 | @@ -3541,8 +3540,7 @@ | |
148 | gint res; | |
149 | GtkMessageDialog* _tmp13_; | |
150 | gint _tmp14_; | |
151 | - _tmp9_ = _ ("Are you sure you want to delete this note?"); | |
152 | - _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _tmp9_); | |
153 | + _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("Are you sure you want to delete this note?")); | |
154 | g_object_ref_sink (_tmp10_); | |
155 | dialog = _tmp10_; | |
156 | _tmp11_ = dialog; | |
157 | @@ -3687,15 +3685,11 @@ | |
158 | _tmp34_ = name; | |
159 | _tmp35_ = xnp_window_note_name_exists (self, _tmp34_); | |
160 | if (_tmp35_) { | |
161 | - const gchar* _tmp36_ = NULL; | |
162 | - const gchar* _tmp37_; | |
163 | GtkMessageDialog* _tmp38_; | |
164 | GtkMessageDialog* error_dialog; | |
165 | GtkMessageDialog* _tmp39_; | |
166 | GtkMessageDialog* _tmp40_; | |
167 | - _tmp36_ = _ ("The name %s is already in use"); | |
168 | - _tmp37_ = name; | |
169 | - _tmp38_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp36_, _tmp37_); | |
170 | + _tmp38_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("The name %s is already in use"), name); | |
171 | g_object_ref_sink (_tmp38_); | |
172 | error_dialog = _tmp38_; | |
173 | _tmp39_ = error_dialog; |