Midori Web Browser

Merge lp:~cavalier/midori/dialog-packing into lp:midori

  1. dialog-packing
  2. Merge into trunk
Proposed by Peter de Ridder
Status: Merged
Approved by: André Stösel
Approved revision: 6346
Merged at revision: 6344
Proposed branch: lp:~cavalier/midori/dialog-packing
Merge into: lp:midori
Diff against target: 264 lines (+28/-28)
9 files modified
extensions/adblock.c (+1/-1)
extensions/cookie-permissions/cookie-permission-manager-preferences-window.c (+4/-4)
extensions/feed-panel/main.c (+1/-1)
extensions/formhistory/formhistory.c (+3/-3)
extensions/nojs/nojs-preferences.c (+5/-5)
katze/katze-http-auth.c (+6/-6)
midori/midori-browser.c (+2/-2)
midori/midori-frontend.c (+2/-2)
midori/midori-searchaction.c (+4/-4)
To merge this branch: bzr merge lp:~cavalier/midori/dialog-packing
Reviewer Review Type Date Requested Status
André Stösel Approve
Review via email: mp+179789@code.launchpad.net

Commit message

Correct packing of cookie and nojs permission dialog.

To post a comment you must log in.
Revision history for this message
André Stösel (ivaldi) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'extensions/adblock.c'
2--- extensions/adblock.c 2013-07-28 20:18:39 +0000
3+++ extensions/adblock.c 2013-08-12 20:25:31 +0000
4@@ -936,7 +936,7 @@
5 gtk_entry_set_text (GTK_ENTRY (entry),
6 g_object_get_data (G_OBJECT (widget), "uri"));
7 gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
8- gtk_container_add (GTK_CONTAINER (content_area), hbox);
9+ gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
10 gtk_widget_show_all (hbox);
11
12 gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
13
14=== modified file 'extensions/cookie-permissions/cookie-permission-manager-preferences-window.c'
15--- extensions/cookie-permissions/cookie-permission-manager-preferences-window.c 2013-03-23 11:36:21 +0000
16+++ extensions/cookie-permissions/cookie-permission-manager-preferences-window.c 2013-08-12 20:25:31 +0000
17@@ -723,7 +723,7 @@
18 gtk_container_add(GTK_CONTAINER(hbox), priv->addDomainButton);
19 g_signal_connect_swapped(priv->addDomainButton, "clicked", G_CALLBACK(_cookie_permission_manager_preferences_on_add_domain_clicked), self);
20
21- gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 5);
22+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 5);
23
24 /* Set up cookie domain list */
25 priv->list=gtk_tree_view_new_with_model(GTK_TREE_MODEL(priv->listStore));
26@@ -780,7 +780,7 @@
27 gtk_container_add(GTK_CONTAINER(hbox), priv->deleteAllButton);
28 g_signal_connect_swapped(priv->deleteAllButton, "clicked", G_CALLBACK(_cookie_permission_manager_preferences_on_delete_all), self);
29
30- gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 5);
31+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 5);
32
33 /* Add "ask-for-unknown-policy" checkbox */
34 priv->askForUnknownPolicyCheckbox=gtk_check_button_new_with_mnemonic(_("A_sk for policy if unknown for a domain"));
35@@ -788,10 +788,10 @@
36 "toggled",
37 G_CALLBACK(_cookie_permission_manager_preferences_window_ask_for_unknown_policy_changed),
38 self);
39- gtk_box_pack_start(GTK_BOX(vbox), priv->askForUnknownPolicyCheckbox, TRUE, TRUE, 5);
40+ gtk_box_pack_start(GTK_BOX(vbox), priv->askForUnknownPolicyCheckbox, FALSE, TRUE, 5);
41
42 /* Finalize setup of content area */
43- gtk_container_add(GTK_CONTAINER(priv->contentArea), vbox);
44+ gtk_box_pack_start(GTK_BOX(priv->contentArea), vbox, TRUE, TRUE, 0);
45 }
46
47 /* Implementation: Public API */
48
49=== modified file 'extensions/feed-panel/main.c'
50--- extensions/feed-panel/main.c 2013-07-27 12:35:55 +0000
51+++ extensions/feed-panel/main.c 2013-08-12 20:25:31 +0000
52@@ -366,7 +366,7 @@
53 gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
54 gtk_entry_set_text (GTK_ENTRY (entry), "");
55 gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
56- gtk_container_add (GTK_CONTAINER(gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox);
57+ gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, TRUE, 0);
58 gtk_widget_show_all (hbox);
59
60 gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
61
62=== modified file 'extensions/formhistory/formhistory.c'
63--- extensions/formhistory/formhistory.c 2013-06-17 19:15:01 +0000
64+++ extensions/formhistory/formhistory.c 2013-08-12 20:25:31 +0000
65@@ -117,13 +117,13 @@
66 label = gtk_label_new (_("Master password required\n"
67 "to open password database"));
68 gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
69- gtk_container_add (GTK_CONTAINER (content_area), hbox);
70+ gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
71
72 entry = gtk_entry_new ();
73 g_object_set (entry, "truncate-multiline", TRUE, NULL);
74 gtk_entry_set_visibility(GTK_ENTRY (entry),FALSE);
75 gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
76- gtk_container_add (GTK_CONTAINER (content_area), entry);
77+ gtk_box_pack_start (GTK_BOX (content_area), entry, FALSE, TRUE, 0);
78
79 gtk_widget_show_all (entry);
80 gtk_widget_show_all (hbox);
81@@ -612,7 +612,7 @@
82 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox),
83 !midori_extension_get_boolean (extension, "always-load"));
84 g_object_set_data (G_OBJECT (dialog), "always-load-checkbox", checkbox);
85- gtk_container_add (GTK_CONTAINER (content_area), checkbox);
86+ gtk_box_pack_start (GTK_BOX (content_area), checkbox, FALSE, TRUE, 0);
87 /* FIXME: Add pref to disable password manager */
88
89 g_signal_connect (dialog,
90
91=== modified file 'extensions/nojs/nojs-preferences.c'
92--- extensions/nojs/nojs-preferences.c 2013-07-05 16:10:15 +0000
93+++ extensions/nojs/nojs-preferences.c 2013-08-12 20:25:31 +0000
94@@ -705,7 +705,7 @@
95 gtk_container_add(GTK_CONTAINER(hbox), priv->deleteAllButton);
96 g_signal_connect_swapped(priv->deleteAllButton, "clicked", G_CALLBACK(_nojs_preferences_on_delete_all), self);
97
98- gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 5);
99+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 5);
100
101 /* Add "allow-all-sites" checkbox */
102 priv->allowAllSitesCheckbox=gtk_check_button_new_with_mnemonic(_("A_llow scripts at all sites"));
103@@ -713,7 +713,7 @@
104 "toggled",
105 G_CALLBACK(_nojs_preferences_on_allow_all_sites_changed),
106 self);
107- gtk_box_pack_start(GTK_BOX(vbox), priv->allowAllSitesCheckbox, TRUE, TRUE, 5);
108+ gtk_box_pack_start(GTK_BOX(vbox), priv->allowAllSitesCheckbox, FALSE, TRUE, 5);
109
110 /* Add "block-unknown-domains" checkbox */
111 priv->blockUnknownDomainsCheckbox=gtk_check_button_new_with_mnemonic(_("Bloc_k scripts at unknown domains by default"));
112@@ -721,7 +721,7 @@
113 "toggled",
114 G_CALLBACK(_nojs_preferences_on_block_unknown_domains_changed),
115 self);
116- gtk_box_pack_start(GTK_BOX(vbox), priv->blockUnknownDomainsCheckbox, TRUE, TRUE, 5);
117+ gtk_box_pack_start(GTK_BOX(vbox), priv->blockUnknownDomainsCheckbox, FALSE, TRUE, 5);
118
119 /* Add "check-second-level-only" checkbox */
120 priv->checkSecondLevelOnlyCheckbox=gtk_check_button_new_with_mnemonic(_("S_et permissions on second-level domain"));
121@@ -729,10 +729,10 @@
122 "toggled",
123 G_CALLBACK(_nojs_preferences_on_check_second_level_only_changed),
124 self);
125- gtk_box_pack_start(GTK_BOX(vbox), priv->checkSecondLevelOnlyCheckbox, TRUE, TRUE, 5);
126+ gtk_box_pack_start(GTK_BOX(vbox), priv->checkSecondLevelOnlyCheckbox, FALSE, TRUE, 5);
127
128 /* Finalize setup of content area */
129- gtk_container_add(GTK_CONTAINER(priv->contentArea), vbox);
130+ gtk_box_pack_start(GTK_BOX(priv->contentArea), vbox, TRUE, TRUE, 0);
131 }
132
133 /* Implementation: Public API */
134
135=== modified file 'katze/katze-http-auth.c'
136--- katze/katze-http-auth.c 2011-10-26 18:07:11 +0000
137+++ katze/katze-http-auth.c 2013-08-12 20:25:31 +0000
138@@ -226,14 +226,14 @@
139 label = gtk_label_new (_("A username and a password are required\n"
140 "to open this location:"));
141 gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
142- gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox);
143+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, TRUE, 0);
144 label = gtk_label_new (soup_auth_get_host (auth));
145- gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), label);
146+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), label, FALSE, TRUE, 0);
147 /* If the realm is merely the host, omit the realm label */
148 if (g_strcmp0 (soup_auth_get_host (auth), soup_auth_get_realm (auth)))
149 {
150 label = gtk_label_new (soup_auth_get_realm (auth));
151- gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), label);
152+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), label, FALSE, TRUE, 0);
153 }
154 sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
155 hbox = gtk_hbox_new (FALSE, 6);
156@@ -248,7 +248,7 @@
157 gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
158 gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
159 g_object_set_data (G_OBJECT (dialog), "username", entry);
160- gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox);
161+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, TRUE, 0);
162 hbox = gtk_hbox_new (FALSE, 6);
163 label = gtk_label_new (_("Password"));
164 align = gtk_alignment_new (0, 0.5, 0, 0);
165@@ -262,13 +262,13 @@
166 gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
167 gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
168 g_object_set_data (G_OBJECT (dialog), "password", entry);
169- gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox);
170+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, TRUE, 0);
171 hbox = gtk_hbox_new (FALSE, 6);
172 label = gtk_check_button_new_with_mnemonic (_("_Remember password"));
173 gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
174 g_object_set_data (G_OBJECT (dialog), "remember", label);
175 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (label), (login != NULL));
176- gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox);
177+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, TRUE, 0);
178 gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
179 gtk_widget_show_all (gtk_dialog_get_content_area (GTK_DIALOG (dialog)));
180
181
182=== modified file 'midori/midori-browser.c'
183--- midori/midori-browser.c 2013-08-06 20:20:49 +0000
184+++ midori/midori-browser.c 2013-08-12 20:25:31 +0000
185@@ -2846,7 +2846,7 @@
186 granite_widgets_contractor_view_name_blacklist (GRANITE_WIDGETS_CONTRACTOR_VIEW (
187 contractor), blacklisted_contracts, -1); */
188 g_free (filename);
189- gtk_container_add (GTK_CONTAINER (content_area), contractor);
190+ gtk_box_pack_start (GTK_BOX (content_area), contractor, TRUE, TRUE, 0);
191 gtk_widget_show (contractor);
192 gtk_widget_show (dialog);
193 /* FIXME: granite: "box" isn't visible by default */
194@@ -4514,7 +4514,7 @@
195 0, _("Import from XBEL or HTML file"), 1, NULL, 2, NULL, 3, icon_width, -1);
196 gtk_combo_box_set_active (combobox, 0);
197 gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
198- gtk_container_add (GTK_CONTAINER (content_area), hbox);
199+ gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
200 gtk_widget_show_all (hbox);
201
202 combobox_folder = midori_bookmark_folder_button_new (browser->bookmarks, 0);
203
204=== modified file 'midori/midori-frontend.c'
205--- midori/midori-frontend.c 2013-07-30 21:00:46 +0000
206+++ midori/midori-frontend.c 2013-08-12 20:25:31 +0000
207@@ -339,7 +339,7 @@
208 gtk_window_set_title (GTK_WINDOW (dialog), g_get_application_name ());
209 content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
210 align = gtk_alignment_new (0.5, 0.5, 0.5, 0.5);
211- gtk_container_add (GTK_CONTAINER (content_area), align);
212+ gtk_box_pack_start (GTK_BOX (content_area), align, FALSE, TRUE, 0);
213 box = gtk_hbox_new (FALSE, 0);
214 gtk_container_add (GTK_CONTAINER (align), box);
215 button = gtk_button_new_with_mnemonic (_("Modify _preferences"));
216@@ -357,7 +357,7 @@
217 button = katze_property_proxy (settings, "show-crash-dialog", NULL);
218 gtk_button_set_label (GTK_BUTTON (button), _("Show a dialog after Midori crashed"));
219 gtk_widget_show (button);
220- gtk_container_add (GTK_CONTAINER (content_area), button);
221+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, TRUE, 0);
222 gtk_container_set_focus_child (GTK_CONTAINER (dialog), gtk_dialog_get_action_area (GTK_DIALOG (dialog)));
223 gtk_dialog_add_buttons (GTK_DIALOG (dialog),
224 _("Discard old tabs"), MIDORI_STARTUP_BLANK_PAGE,
225
226=== modified file 'midori/midori-searchaction.c'
227--- midori/midori-searchaction.c 2013-08-02 23:45:16 +0000
228+++ midori/midori-searchaction.c 2013-08-12 20:25:31 +0000
229@@ -1084,7 +1084,7 @@
230 gtk_entry_set_text (GTK_ENTRY (entry_name),
231 katze_str_non_null (katze_item_get_name (item)));
232 gtk_box_pack_start (GTK_BOX (hbox), entry_name, TRUE, TRUE, 0);
233- gtk_container_add (GTK_CONTAINER (content_area), hbox);
234+ gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
235 gtk_widget_show_all (hbox);
236
237 hbox = gtk_hbox_new (FALSE, 8);
238@@ -1097,7 +1097,7 @@
239 gtk_entry_set_text (GTK_ENTRY (entry_description)
240 , katze_str_non_null (katze_item_get_text (item)));
241 gtk_box_pack_start (GTK_BOX (hbox), entry_description, TRUE, TRUE, 0);
242- gtk_container_add (GTK_CONTAINER (content_area), hbox);
243+ gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
244 gtk_widget_show_all (hbox);
245
246 hbox = gtk_hbox_new (FALSE, 8);
247@@ -1112,7 +1112,7 @@
248 gtk_entry_set_text (GTK_ENTRY (entry_uri),
249 katze_str_non_null (katze_item_get_uri (item)));
250 gtk_box_pack_start (GTK_BOX (hbox), entry_uri, TRUE, TRUE, 0);
251- gtk_container_add (GTK_CONTAINER (content_area), hbox);
252+ gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
253 gtk_widget_show_all (hbox);
254
255 hbox = gtk_hbox_new (FALSE, 8);
256@@ -1125,7 +1125,7 @@
257 gtk_entry_set_text (GTK_ENTRY (entry_token)
258 , katze_str_non_null (katze_item_get_token (item)));
259 gtk_box_pack_start (GTK_BOX (hbox), entry_token, TRUE, TRUE, 0);
260- gtk_container_add (GTK_CONTAINER (content_area), hbox);
261+ gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
262 gtk_widget_show_all (hbox);
263
264 gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);

Subscribers

People subscribed via source and target branches

to all changes: