Midori Web Browser

Merge lp:~codygarver/midori/2013 into lp:midori

  1. 2013
  2. Merge into trunk
Proposed by Cody Garver
Status: Merged
Merged at revision: 6160
Proposed branch: lp:~codygarver/midori/2013
Merge into: lp:midori
Diff against target: 290 lines (+27/-27)
25 files modified
midori/main.c (+1/-1)
midori/midori-app.c (+1/-1)
midori/midori-browser.c (+3/-3)
midori/midori-completion.vala (+1/-1)
midori/midori-dialog.vala (+1/-1)
midori/midori-download.vala (+1/-1)
midori/midori-extension.c (+1/-1)
midori/midori-extension.h (+1/-1)
midori/midori-frontend.c (+1/-1)
midori/midori-frontend.h (+1/-1)
midori/midori-history.c (+1/-1)
midori/midori-history.h (+1/-1)
midori/midori-historycompletion.vala (+1/-1)
midori/midori-platform.h (+1/-1)
midori/midori-privatedata.c (+1/-1)
midori/midori-privatedata.h (+1/-1)
midori/midori-searchcompletion.vala (+1/-1)
midori/midori-session.c (+1/-1)
midori/midori-session.h (+1/-1)
midori/midori-speeddial.vala (+1/-1)
midori/midori-tab.vala (+1/-1)
midori/midori-viewcompletion.vala (+1/-1)
midori/midori-websettings.c (+1/-1)
midori/midori-websettings.h (+1/-1)
midori/sokoke.c (+1/-1)
To merge this branch: bzr merge lp:~codygarver/midori/2013
Reviewer Review Type Date Requested Status
David Gomes (community) Approve
Review via email: mp+164614@code.launchpad.net
To post a comment you must log in.
Revision history for this message
David Gomes (davidgomes) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/main.c'
2--- midori/main.c 2013-05-14 17:55:36 +0000
3+++ midori/main.c 2013-05-19 09:58:30 +0000
4@@ -174,7 +174,7 @@
5 g_string_free (versions, TRUE);
6
7 g_print (
8- "Copyright (c) 2007-2012 Christian Dywan\n\n"
9+ "Copyright (c) 2007-2013 Christian Dywan\n\n"
10 "%s\n"
11 "\t%s\n\n"
12 "%s\n"
13
14=== modified file 'midori/midori-app.c'
15--- midori/midori-app.c 2013-05-08 00:51:02 +0000
16+++ midori/midori-app.c 2013-05-19 09:58:30 +0000
17@@ -1,5 +1,5 @@
18 /*
19- Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
20+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
21
22 This library is free software; you can redistribute it and/or
23 modify it under the terms of the GNU Lesser General Public
24
25=== modified file 'midori/midori-browser.c'
26--- midori/midori-browser.c 2013-05-14 18:03:41 +0000
27+++ midori/midori-browser.c 2013-05-19 09:58:30 +0000
28@@ -1,5 +1,5 @@
29 /*
30- Copyright (C) 2007-2011 Christian Dywan <christian@twotoasts.de>
31+ Copyright (C) 2007-2013 Christian Dywan <christian@twotoasts.de>
32 Copyright (C) 2008 Dale Whittaker <dayul@users.sf.net>
33 Copyright (C) 2009 Jérôme Geulfucci <jeromeg@xfce.org>
34
35@@ -4779,12 +4779,12 @@
36 "translate", "https://translations.xfce.org/projects/p/midori/",
37 "bug", PACKAGE_BUGREPORT,
38 "help", docs,
39- "copyright", "2007-2012 Christian Dywan",
40+ "copyright", "2007-2013 Christian Dywan",
41 #else
42 GtkWidget* dialog = gtk_about_dialog_new ();
43 g_object_set (dialog,
44 "wrap-license", TRUE,
45- "copyright", "Copyright © 2007-2012 Christian Dywan",
46+ "copyright", "Copyright © 2007-2013 Christian Dywan",
47 #endif
48 "transient-for", browser,
49 "logo-icon-name", gtk_window_get_icon_name (GTK_WINDOW (browser)),
50
51=== modified file 'midori/midori-completion.vala'
52--- midori/midori-completion.vala 2013-02-28 23:15:04 +0000
53+++ midori/midori-completion.vala 2013-05-19 09:58:30 +0000
54@@ -1,5 +1,5 @@
55 /*
56- Copyright (C) 2012 Christian Dywan <christian@twotoasts.de>
57+ Copyright (C) 2012-2013 Christian Dywan <christian@twotoasts.de>
58
59 This library is free software; you can redistribute it and/or
60 modify it under the terms of the GNU Lesser General Public
61
62=== modified file 'midori/midori-dialog.vala'
63--- midori/midori-dialog.vala 2013-03-30 15:59:48 +0000
64+++ midori/midori-dialog.vala 2013-05-19 09:58:30 +0000
65@@ -1,5 +1,5 @@
66 /*
67- Copyright (C) 2011-2012 Christian Dywan <christian@twotoats.de>
68+ Copyright (C) 2011-2013 Christian Dywan <christian@twotoats.de>
69
70 This library is free software; you can redistribute it and/or
71 modify it under the terms of the GNU Lesser General Public
72
73=== modified file 'midori/midori-download.vala'
74--- midori/midori-download.vala 2013-04-20 00:46:39 +0000
75+++ midori/midori-download.vala 2013-05-19 09:58:30 +0000
76@@ -1,5 +1,5 @@
77 /*
78- Copyright (C) 2012 Christian Dywan <christian@twotoasts.de>
79+ Copyright (C) 2012-2013 Christian Dywan <christian@twotoasts.de>
80
81 This library is free software; you can redistribute it and/or
82 modify it under the terms of the GNU Lesser General Public
83
84=== modified file 'midori/midori-extension.c'
85--- midori/midori-extension.c 2013-05-15 19:52:41 +0000
86+++ midori/midori-extension.c 2013-05-19 09:58:30 +0000
87@@ -1,5 +1,5 @@
88 /*
89- Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
90+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
91 Copyright (C) 2009 Dale Whittaker <dayul@users.sf.net>
92
93 This library is free software; you can redistribute it and/or
94
95=== modified file 'midori/midori-extension.h'
96--- midori/midori-extension.h 2013-05-08 00:50:27 +0000
97+++ midori/midori-extension.h 2013-05-19 09:58:30 +0000
98@@ -1,5 +1,5 @@
99 /*
100- Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
101+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
102
103 This library is free software; you can redistribute it and/or
104 modify it under the terms of the GNU Lesser General Public
105
106=== modified file 'midori/midori-frontend.c'
107--- midori/midori-frontend.c 2013-05-14 17:52:53 +0000
108+++ midori/midori-frontend.c 2013-05-19 09:58:30 +0000
109@@ -1,5 +1,5 @@
110 /*
111- Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
112+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
113
114 This library is free software; you can redistribute it and/or
115 modify it under the terms of the GNU Lesser General Public
116
117=== modified file 'midori/midori-frontend.h'
118--- midori/midori-frontend.h 2012-12-13 23:58:32 +0000
119+++ midori/midori-frontend.h 2013-05-19 09:58:30 +0000
120@@ -1,5 +1,5 @@
121 /*
122- Copyright (C) 2012 Christian Dywan <christian@twotoasts.de>
123+ Copyright (C) 2012-2013 Christian Dywan <christian@twotoasts.de>
124
125 This library is free software; you can redistribute it and/or
126 modify it under the terms of the GNU Lesser General Public
127
128=== modified file 'midori/midori-history.c'
129--- midori/midori-history.c 2012-11-25 15:37:41 +0000
130+++ midori/midori-history.c 2013-05-19 09:58:30 +0000
131@@ -1,5 +1,5 @@
132 /*
133- Copyright (C) 2010-2012 Christian Dywan <christian@twotoasts.de>
134+ Copyright (C) 2010-2013 Christian Dywan <christian@twotoasts.de>
135
136 This library is free software; you can redistribute it and/or
137 modify it under the terms of the GNU Lesser General Public
138
139=== modified file 'midori/midori-history.h'
140--- midori/midori-history.h 2012-11-25 11:26:03 +0000
141+++ midori/midori-history.h 2013-05-19 09:58:30 +0000
142@@ -1,5 +1,5 @@
143 /*
144- Copyright (C) 2010-2012 Christian Dywan <christian@twotoasts.de>
145+ Copyright (C) 2010-2013 Christian Dywan <christian@twotoasts.de>
146
147 This library is free software; you can redistribute it and/or
148 modify it under the terms of the GNU Lesser General Public
149
150=== modified file 'midori/midori-historycompletion.vala'
151--- midori/midori-historycompletion.vala 2012-12-06 00:49:31 +0000
152+++ midori/midori-historycompletion.vala 2013-05-19 09:58:30 +0000
153@@ -1,5 +1,5 @@
154 /*
155- Copyright (C) 2012 Christian Dywan <christian@twotoasts.de>
156+ Copyright (C) 2012-2013 Christian Dywan <christian@twotoasts.de>
157
158 This library is free software; you can redistribute it and/or
159 modify it under the terms of the GNU Lesser General Public
160
161=== modified file 'midori/midori-platform.h'
162--- midori/midori-platform.h 2013-04-16 23:16:24 +0000
163+++ midori/midori-platform.h 2013-05-19 09:58:30 +0000
164@@ -1,5 +1,5 @@
165 /*
166- Copyright (C) 2010-2011 Christian Dywan <christian@twotoasts.de>
167+ Copyright (C) 2010-2013 Christian Dywan <christian@twotoasts.de>
168
169 This library is free software; you can redistribute it and/or
170 modify it under the terms of the GNU Lesser General Public
171
172=== modified file 'midori/midori-privatedata.c'
173--- midori/midori-privatedata.c 2013-04-06 20:02:30 +0000
174+++ midori/midori-privatedata.c 2013-05-19 09:58:30 +0000
175@@ -1,5 +1,5 @@
176 /*
177- Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
178+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
179
180 This library is free software; you can redistribute it and/or
181 modify it under the terms of the GNU Lesser General Public
182
183=== modified file 'midori/midori-privatedata.h'
184--- midori/midori-privatedata.h 2013-02-21 21:36:30 +0000
185+++ midori/midori-privatedata.h 2013-05-19 09:58:30 +0000
186@@ -1,5 +1,5 @@
187 /*
188- Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
189+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
190
191 This library is free software; you can redistribute it and/or
192 modify it under the terms of the GNU Lesser General Public
193
194=== modified file 'midori/midori-searchcompletion.vala'
195--- midori/midori-searchcompletion.vala 2013-01-31 08:14:03 +0000
196+++ midori/midori-searchcompletion.vala 2013-05-19 09:58:30 +0000
197@@ -1,5 +1,5 @@
198 /*
199- Copyright (C) 2012 Christian Dywan <christian@twotoasts.de>
200+ Copyright (C) 2012-2013 Christian Dywan <christian@twotoasts.de>
201
202 This library is free software; you can redistribute it and/or
203 modify it under the terms of the GNU Lesser General Public
204
205=== modified file 'midori/midori-session.c'
206--- midori/midori-session.c 2013-04-08 18:35:37 +0000
207+++ midori/midori-session.c 2013-05-19 09:58:30 +0000
208@@ -1,5 +1,5 @@
209 /*
210- Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
211+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
212
213 This library is free software; you can redistribute it and/or
214 modify it under the terms of the GNU Lesser General Public
215
216=== modified file 'midori/midori-session.h'
217--- midori/midori-session.h 2012-11-26 18:05:35 +0000
218+++ midori/midori-session.h 2013-05-19 09:58:30 +0000
219@@ -1,5 +1,5 @@
220 /*
221- Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
222+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
223
224 This library is free software; you can redistribute it and/or
225 modify it under the terms of the GNU Lesser General Public
226
227=== modified file 'midori/midori-speeddial.vala'
228--- midori/midori-speeddial.vala 2013-04-07 19:34:42 +0000
229+++ midori/midori-speeddial.vala 2013-05-19 09:58:30 +0000
230@@ -1,5 +1,5 @@
231 /*
232- Copyright (C) 2011-2012 Christian Dywan <christian@twotoats.de>
233+ Copyright (C) 2011-2013 Christian Dywan <christian@twotoats.de>
234
235 This library is free software; you can redistribute it and/or
236 modify it under the terms of the GNU Lesser General Public
237
238=== modified file 'midori/midori-tab.vala'
239--- midori/midori-tab.vala 2013-05-08 00:51:10 +0000
240+++ midori/midori-tab.vala 2013-05-19 09:58:30 +0000
241@@ -1,5 +1,5 @@
242 /*
243- Copyright (C) 2007-2012 Christian Dywan <christian@twotoasts.de>
244+ Copyright (C) 2007-2013 Christian Dywan <christian@twotoasts.de>
245 Copyright (C) 2009 Jean-François Guchens <zcx000@gmail.com>
246 Copyright (C) 2011 Peter Hatina <phatina@redhat.com>
247
248
249=== modified file 'midori/midori-viewcompletion.vala'
250--- midori/midori-viewcompletion.vala 2013-02-28 23:15:04 +0000
251+++ midori/midori-viewcompletion.vala 2013-05-19 09:58:30 +0000
252@@ -1,5 +1,5 @@
253 /*
254- Copyright (C) 2012 Christian Dywan <christian@twotoasts.de>
255+ Copyright (C) 2012-2013 Christian Dywan <christian@twotoasts.de>
256
257 This library is free software; you can redistribute it and/or
258 modify it under the terms of the GNU Lesser General Public
259
260=== modified file 'midori/midori-websettings.c'
261--- midori/midori-websettings.c 2013-04-08 18:40:02 +0000
262+++ midori/midori-websettings.c 2013-05-19 09:58:30 +0000
263@@ -1,5 +1,5 @@
264 /*
265- Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
266+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
267 Copyright (C) 2011 Peter Hatina <phatina@redhat.com>
268
269 This library is free software; you can redistribute it and/or
270
271=== modified file 'midori/midori-websettings.h'
272--- midori/midori-websettings.h 2013-04-08 18:35:37 +0000
273+++ midori/midori-websettings.h 2013-05-19 09:58:30 +0000
274@@ -1,5 +1,5 @@
275 /*
276- Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
277+ Copyright (C) 2008-2013 Christian Dywan <christian@twotoasts.de>
278
279 This library is free software; you can redistribute it and/or
280 modify it under the terms of the GNU Lesser General Public
281
282=== modified file 'midori/sokoke.c'
283--- midori/sokoke.c 2013-04-11 20:38:19 +0000
284+++ midori/sokoke.c 2013-05-19 09:58:30 +0000
285@@ -1,5 +1,5 @@
286 /*
287- Copyright (C) 2007-2011 Christian Dywan <christian@twotoasts.de>
288+ Copyright (C) 2007-2013 Christian Dywan <christian@twotoasts.de>
289 Copyright (C) 2009 Dale Whittaker <dayul@users.sf.net>
290 Copyright (C) 2009 Alexander Butenko <a.butenka@gmail.com>
291

Subscribers

People subscribed via source and target branches

to all changes: