← Back to branch summary

~ubuntu-branches/ubuntu/lucid/pidgin/lucid-security

« back to all changes in this revision

Viewing changes to debian/patches/60_1024x600_gtkaccount.c.patch

  • Committer: Bazaar Package Importer
  • Author(s): Ying-Chun Liu (PaulLiu)
  • Date: 2009-02-25 16:55:42 UTC
  • Revision ID: james.westby@ubuntu.com-20090225165542-48ul3r0l71zmvo20
Tags: 1:2.5.4-2ubuntu2
https://launchpad.net/bugs/305019
* 60_1024x600_gtkaccount.c.patch: Add scrolled bars into account dialog
  when screen height is less than 600. (LP: #305019)
* 60_1024x600_gtkpounce.c.patch: Add scrolled bars into pounce window when
  screen height is less than 600
* 60_1024x600_gtkprefs.c.patch: Add scrolled bars into preference window when
  screen height is less than 600

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/60_1024x600_gtkaccount.c.patch
 
1
diff -Nur -x '*.orig' -x '*~' pidgin-2.5.4/pidgin/gtkaccount.c pidgin-2.5.4.new/pidgin/gtkaccount.c
 
2
--- pidgin-2.5.4/pidgin/gtkaccount.c    2009-01-13 03:05:39.000000000 +0800
 
3
+++ pidgin-2.5.4.new/pidgin/gtkaccount.c        2009-02-26 00:33:23.277274038 +0800
 
4
@@ -1461,6 +1461,8 @@
 
5
        GtkWidget *dbox;
 
6
        GtkWidget *notebook;
 
7
        GtkWidget *button;
 
8
+       GtkWidget *scrolledWindow1024x600=NULL;
 
9
+       GtkWidget *vbox1024x600=NULL;
 
10
 
 
11
        if (accounts_window != NULL && account != NULL &&
 
12
                (dialog = g_hash_table_lookup(account_pref_wins, account)) != NULL)
 
13
@@ -1538,8 +1540,22 @@
 
14
        gtk_widget_show(dbox);
 
15
 
 
16
        /** Setup the bottom frames. */
 
17
-       add_protocol_options(dialog, dbox);
 
18
-       add_proxy_options(dialog, dbox);
 
19
+       if (gdk_screen_get_default() != NULL && gdk_screen_get_height(gdk_screen_get_default()) <= 600) {
 
20
+         scrolledWindow1024x600 = gtk_scrolled_window_new(NULL,NULL);
 
21
+         gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),GTK_POLICY_NEVER,GTK_POLICY_AUTOMATIC);
 
22
+         gtk_container_add(GTK_CONTAINER(dbox), scrolledWindow1024x600);
 
23
+         gtk_widget_show(scrolledWindow1024x600);
 
24
+         vbox1024x600 = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
 
25
+         gtk_container_set_border_width(GTK_CONTAINER(vbox1024x600), PIDGIN_HIG_BORDER);
 
26
+         gtk_widget_show(vbox1024x600);
 
27
+         gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolledWindow1024x600), vbox1024x600);
 
28
+         add_protocol_options(dialog, vbox1024x600);
 
29
+         add_proxy_options(dialog, vbox1024x600);
 
30
+         dialog->bottom_vbox = vbox1024x600;
 
31
+       } else {
 
32
+         add_protocol_options(dialog, dbox);
 
33
+         add_proxy_options(dialog, dbox);
 
34
+       }
 
35
 
 
36
        /* Cancel button */
 
37
        pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_CANCEL, G_CALLBACK(cancel_account_prefs_cb), dialog);