cpw.qulogic.gtk3-required: b6ce6b27: Remove extra padding that makes things l...
qulogic at pidgin.im
qulogic at pidgin.im
Sun May 27 00:35:27 EDT 2012
----------------------------------------------------------------------
Revision: b6ce6b27288686bcd78dcca7b03d573906f7aee1
Parent: d9782dd45fd95e672e5926fd60d319ca5d956512
Author: qulogic at pidgin.im
Date: 05/26/12 15:36:28
Branch: im.pidgin.cpw.qulogic.gtk3-required
URL: http://d.pidgin.im/viewmtn/revision/info/b6ce6b27288686bcd78dcca7b03d573906f7aee1
Changelog:
Remove extra padding that makes things look not-so-good.
Changes against parent d9782dd45fd95e672e5926fd60d319ca5d956512
patched pidgin/gtkaccount.c
patched pidgin/gtkcertmgr.c
patched pidgin/gtkdialogs.c
patched pidgin/gtkft.c
patched pidgin/gtknotify.c
patched pidgin/gtkpluginpref.c
patched pidgin/gtkpounce.c
patched pidgin/gtkprefs.c
patched pidgin/gtkroomlist.c
patched pidgin/gtksmiley.c
-------------- next part --------------
============================================================
--- pidgin/gtkft.c c1adf6b48eb30131fe65b2c378f26248aba5a727
+++ pidgin/gtkft.c f8890b67e19a24a58e9b51f148cb36ee999ec771
@@ -701,7 +701,7 @@ pidgin_xfer_dialog_new(void)
{
PidginXferDialog *dialog;
GtkWidget *window;
- GtkWidget *vbox1, *vbox2;
+ GtkWidget *vbox;
GtkWidget *expander;
GtkWidget *alignment;
GtkWidget *table;
@@ -715,24 +715,17 @@ pidgin_xfer_dialog_new(void)
purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/filetransfer/clear_finished");
/* Create the window. */
- dialog->window = window = pidgin_create_window(_("File Transfers"), PIDGIN_HIG_BORDER, "file transfer", TRUE);
+ dialog->window = window = pidgin_create_dialog(_("File Transfers"), 0, "file transfer", TRUE);
gtk_window_set_default_size(GTK_WINDOW(window), 450, 250);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(delete_win_cb), dialog);
- /* Create the parent vbox for everything. */
- vbox1 = gtk_vbox_new(FALSE, 0);
- gtk_widget_show(vbox1);
- gtk_container_add(GTK_CONTAINER(window), vbox1);
-
/* Create the main vbox for top half of the window. */
- vbox2 = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
- gtk_box_pack_start(GTK_BOX(vbox1), vbox2, TRUE, TRUE, 0);
- gtk_widget_show(vbox2);
+ vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(window), FALSE, PIDGIN_HIG_BORDER);
/* Setup the listbox */
- gtk_box_pack_start(GTK_BOX(vbox2),
+ gtk_box_pack_start(GTK_BOX(vbox),
pidgin_make_scrollable(setup_tree(dialog), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC, GTK_SHADOW_IN, -1, 140),
TRUE, TRUE, 0);
@@ -743,7 +736,7 @@ pidgin_xfer_dialog_new(void)
!dialog->keep_open);
g_signal_connect(G_OBJECT(checkbox), "toggled",
G_CALLBACK(toggle_keep_open_cb), dialog);
- gtk_box_pack_start(GTK_BOX(vbox2), checkbox, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), checkbox, FALSE, FALSE, 0);
gtk_widget_show(checkbox);
/* "Clear finished transfers" */
@@ -753,13 +746,13 @@ pidgin_xfer_dialog_new(void)
dialog->auto_clear);
g_signal_connect(G_OBJECT(checkbox), "toggled",
G_CALLBACK(toggle_clear_finished_cb), dialog);
- gtk_box_pack_start(GTK_BOX(vbox2), checkbox, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), checkbox, FALSE, FALSE, 0);
gtk_widget_show(checkbox);
/* "Download Details" arrow */
expander = gtk_expander_new_with_mnemonic(_("File transfer _details"));
dialog->expander = expander;
- gtk_box_pack_start(GTK_BOX(vbox2), expander, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), expander, FALSE, FALSE, 0);
gtk_widget_show(expander);
gtk_widget_set_sensitive(expander, FALSE);
@@ -775,11 +768,7 @@ pidgin_xfer_dialog_new(void)
gtk_container_add(GTK_CONTAINER(alignment), table);
gtk_widget_show(table);
- bbox = gtk_hbutton_box_new();
- gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
- gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE);
- gtk_box_pack_end(GTK_BOX(vbox1), bbox, FALSE, TRUE, 0);
- gtk_widget_show(bbox);
+ bbox = gtk_dialog_get_action_area(GTK_DIALOG(window));
#define ADD_BUTTON(b, label, callback, callbackdata) do { \
GtkWidget *button = gtk_button_new_from_stock(label); \
============================================================
--- pidgin/gtkpounce.c bff744d628976a8814c32c0ef9c5a192b9d22cb9
+++ pidgin/gtkpounce.c fe3f1ebb02c1e7381c98dfe1d39a6581621af8d8
@@ -536,7 +536,6 @@ pidgin_pounce_editor_show(PurpleAccount
dialog->window = window = gtk_dialog_new();
gtk_window_set_title(GTK_WINDOW(window), (cur_pounce == NULL ? _("Add Buddy Pounce") : _("Modify Buddy Pounce")));
gtk_window_set_role(GTK_WINDOW(window), "buddy_pounce");
- gtk_container_set_border_width(GTK_CONTAINER(dialog->window), PIDGIN_HIG_BORDER);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(delete_win_cb), dialog);
@@ -1333,7 +1332,7 @@ pidgin_pounces_manager_show(void)
width = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/pounces/dialog/width");
height = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/pounces/dialog/height");
- dialog->window = win = pidgin_create_dialog(_("Buddy Pounces"), PIDGIN_HIG_BORDER, "pounces", TRUE);
+ dialog->window = win = pidgin_create_dialog(_("Buddy Pounces"), 0, "pounces", TRUE);
gtk_window_set_default_size(GTK_WINDOW(win), width, height);
g_signal_connect(G_OBJECT(win), "delete_event",
============================================================
--- pidgin/gtknotify.c c05be813585ae217043ac1d0f80a6944ba0b99f3
+++ pidgin/gtknotify.c 37c0a306e5a71846c399d772bdd83c57351be9c8
@@ -841,7 +841,6 @@ pidgin_notify_formatted(const char *titl
window = gtk_dialog_new();
gtk_window_set_title(GTK_WINDOW(window), title);
- gtk_container_set_border_width(GTK_CONTAINER(window), PIDGIN_HIG_BORDER);
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
g_signal_connect(G_OBJECT(window), "delete_event",
============================================================
--- pidgin/gtkprefs.c efb100b5a5f873c3836f5bc8d0ab147efce57770
+++ pidgin/gtkprefs.c 67a44b7442421835618baf7883778a39eda66219
@@ -2981,7 +2981,7 @@ pidgin_prefs_show(void)
/* Back to instant-apply! I win! BU-HAHAHA! */
/* Create the window */
- prefs = pidgin_create_dialog(_("Preferences"), PIDGIN_HIG_BORDER, "preferences", FALSE);
+ prefs = pidgin_create_dialog(_("Preferences"), 0, "preferences", FALSE);
g_signal_connect(G_OBJECT(prefs), "destroy",
G_CALLBACK(delete_prefs), NULL);
============================================================
--- pidgin/gtkaccount.c cc6d180d572f7d8f758ae733f9ca673955a92b1a
+++ pidgin/gtkaccount.c ddb71276741ac5a7e4f16dea091acab5e2cf4b77
@@ -2328,7 +2328,7 @@ pidgin_accounts_window_show(void)
width = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/accounts/dialog/width");
height = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/accounts/dialog/height");
- dialog->window = win = pidgin_create_dialog(_("Accounts"), PIDGIN_HIG_BORDER, "accounts", TRUE);
+ dialog->window = win = pidgin_create_dialog(_("Accounts"), 0, "accounts", TRUE);
gtk_window_set_default_size(GTK_WINDOW(win), width, height);
g_signal_connect(G_OBJECT(win), "delete_event",
============================================================
--- pidgin/gtkroomlist.c 0d7cd4cafe76a4e3a740baf1238cf53d729d319b
+++ pidgin/gtkroomlist.c 4db08a2ef8a6e4ddfefcf5216f0cee216740bcba
@@ -536,7 +536,7 @@ pidgin_roomlist_dialog_new_with_account(
dialog->account = account;
/* Create the window. */
- dialog->window = window = pidgin_create_dialog(_("Room List"), PIDGIN_HIG_BORDER, "room list", TRUE);
+ dialog->window = window = pidgin_create_dialog(_("Room List"), 0, "room list", TRUE);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(delete_win_cb), dialog);
============================================================
--- pidgin/gtkpluginpref.c a60cc5d8fe69d72c45769f50d1ae29d81c21f40f
+++ pidgin/gtkpluginpref.c 668cabb13822c8b6f4dd23eb00c6666bb19d8e27
@@ -211,7 +211,6 @@ pidgin_plugin_pref_create_frame(PurplePl
sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
parent = ret = gtk_vbox_new(FALSE, 16);
- gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER);
gtk_widget_show(ret);
for(pp = purple_plugin_pref_frame_get_prefs(frame);
============================================================
--- pidgin/gtkdialogs.c ead20fcf4ecb72cec93eb6db4fd07b5cd7e442b9
+++ pidgin/gtkdialogs.c c83459672346e7f185d2d43620fd2fa77e5de3a4
@@ -434,8 +434,8 @@ pidgin_build_help_dialog(const char *tit
AtkObject *obj;
char *filename, *tmp;
- win = pidgin_create_dialog(title, PIDGIN_HIG_BORDER, role, TRUE);
- vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, PIDGIN_HIG_BORDER);
+ win = pidgin_create_dialog(title, 0, role, TRUE);
+ vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, 0);
gtk_window_set_default_size(GTK_WINDOW(win), 450, 450);
/* Generate a logo with a version number */
============================================================
--- pidgin/gtkcertmgr.c ba29f5c1ed73be9eeef44e5c1de45abb1e45cf11
+++ pidgin/gtkcertmgr.c 2e14ab1de6c0e28c4edee5c1dbb5a826a8855ede
@@ -613,7 +613,7 @@ pidgin_certmgr_show(void)
win = dlg->window =
pidgin_create_dialog(_("Certificate Manager"),/* Title */
- PIDGIN_HIG_BORDER, /*Window border*/
+ 0, /*Window border*/
"certmgr", /* Role */
TRUE); /* Allow resizing */
g_signal_connect(G_OBJECT(win), "delete_event",
============================================================
--- pidgin/gtksmiley.c 7dbed91eef24150e9e0eb95eefc8a41f0e8dc0b4
+++ pidgin/gtksmiley.c 43e7300837a5431fd965f8bc1b9cb819c73159e2
@@ -407,8 +407,6 @@ pidgin_smiley_edit(GtkWidget *widget, Pu
if (smiley)
g_object_set_data(G_OBJECT(smiley), "edit-dialog", window);
- gtk_container_set_border_width(GTK_CONTAINER(window), PIDGIN_HIG_BORDER);
-
gtk_dialog_set_default_response(GTK_DIALOG(window), GTK_RESPONSE_ACCEPT);
g_signal_connect(window, "response", G_CALLBACK(do_add_select_cb), s);
@@ -874,7 +872,6 @@ void pidgin_smiley_manager_show(void)
gtk_window_set_default_size(GTK_WINDOW(win), 50, 400);
gtk_window_set_role(GTK_WINDOW(win), "custom_smiley_manager");
- gtk_container_set_border_width(GTK_CONTAINER(win),PIDGIN_HIG_BORDER);
gtk_dialog_set_response_sensitive(GTK_DIALOG(win), GTK_RESPONSE_NO, FALSE);
gtk_dialog_set_response_sensitive(GTK_DIALOG(win),
PIDGIN_RESPONSE_MODIFY, FALSE);
More information about the Commits
mailing list