← Back to branch summary

~ubuntu-branches/ubuntu/karmic/pidgin/karmic

« back to all changes in this revision

Viewing changes to debian/patches/60_1024x600_gtkpounce.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_gtkpounce.c.patch
 
1
diff -Nur -x '*.orig' -x '*~' pidgin-2.5.4/pidgin/gtkpounce.c pidgin-2.5.4.new/pidgin/gtkpounce.c
 
2
--- pidgin-2.5.4/pidgin/gtkpounce.c     2009-01-13 03:05:39.000000000 +0800
 
3
+++ pidgin-2.5.4.new/pidgin/gtkpounce.c 2009-02-26 00:38:15.445274448 +0800
 
4
@@ -498,6 +498,7 @@
 
5
        GPtrArray *sound_widgets;
 
6
        GPtrArray *exec_widgets;
 
7
        GtkWidget *send_msg_imhtml;
 
8
+       GtkWidget *scrolledWindow1024x600 = NULL;
 
9
 
 
10
        g_return_if_fail((cur_pounce != NULL) ||
 
11
                         (account != NULL) ||
 
12
@@ -547,8 +548,14 @@
 
13
 
 
14
        /* Create the vbox that will contain all the prefs stuff. */
 
15
        vbox2 = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
 
16
-       gtk_box_pack_start(GTK_BOX(vbox1), vbox2, TRUE, TRUE, 0);
 
17
-
 
18
+       if (gdk_screen_get_default() != NULL && gdk_screen_get_height(gdk_screen_get_default()) <= 600) {
 
19
+         scrolledWindow1024x600 = gtk_scrolled_window_new(NULL,NULL);
 
20
+         gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),GTK_POLICY_NEVER,GTK_POLICY_AUTOMATIC);
 
21
+         gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),vbox2);
 
22
+         gtk_box_pack_start(GTK_BOX(vbox1), scrolledWindow1024x600, TRUE, TRUE, 0);
 
23
+       } else {
 
24
+         gtk_box_pack_start(GTK_BOX(vbox1), vbox2, TRUE, TRUE, 0);
 
25
+       }
 
26
        /* Create the "Pounce on Whom" frame. */
 
27
        frame = pidgin_make_frame(vbox2, _("Pounce on Whom"));
 
28
 
 
29
@@ -1015,6 +1022,12 @@
 
30
        }
 
31
 
 
32
        gtk_widget_show(vbox2);
 
33
+       if (gdk_screen_get_default() != NULL && gdk_screen_get_height(gdk_screen_get_default()) <= 600) {
 
34
+         gint oldw,oldh;
 
35
+         gtk_widget_show(scrolledWindow1024x600);
 
36
+         gtk_window_get_size(GTK_WINDOW(window),&oldw,&oldh);
 
37
+         gtk_window_resize(GTK_WINDOW (window),oldw,448);
 
38
+       }
 
39
        gtk_widget_show(window);
 
40
 }
 
41