← Back to branch summary

~liuxingcs/+junk/IM

« back to all changes in this revision

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

  • Committer: liuxing
  • Date: 2013-04-25 10:41:36 UTC
  • Revision ID: liuxingcs@yeah.net-20130425104136-e5towjtz19wsz1w7
Init IM

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/60_1024x600_gtkpounce.c.patch
 
1
Index: pidgin-2.10.2/pidgin/gtkpounce.c
 
2
===================================================================
 
3
--- pidgin-2.10.2.orig/pidgin/gtkpounce.c       2012-03-14 06:28:02.000000000 +0100
 
4
+++ pidgin-2.10.2/pidgin/gtkpounce.c    2012-03-16 12:33:59.276065914 +0100
 
5
@@ -495,6 +495,7 @@
 
6
        GPtrArray *sound_widgets;
 
7
        GPtrArray *exec_widgets;
 
8
        GtkWidget *send_msg_imhtml;
 
9
+       GtkWidget *scrolledWindow1024x600 = NULL;
 
10
 
 
11
        g_return_if_fail((cur_pounce != NULL) ||
 
12
                         (account != NULL) ||
 
13
@@ -544,8 +545,14 @@
 
14
 
 
15
        /* Create the vbox that will contain all the prefs stuff. */
 
16
        vbox2 = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
 
17
-       gtk_box_pack_start(GTK_BOX(vbox1), vbox2, TRUE, TRUE, 0);
 
18
-
 
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_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),vbox2);
 
23
+         gtk_box_pack_start(GTK_BOX(vbox1), scrolledWindow1024x600, TRUE, TRUE, 0);
 
24
+       } else {
 
25
+         gtk_box_pack_start(GTK_BOX(vbox1), vbox2, TRUE, TRUE, 0);
 
26
+       }
 
27
        /* Create the "Pounce on Whom" frame. */
 
28
        frame = pidgin_make_frame(vbox2, _("Pounce on Whom"));
 
29
 
 
30
@@ -1012,6 +1019,12 @@
 
31
        }
 
32
 
 
33
        gtk_widget_show(vbox2);
 
34
+       if (gdk_screen_get_default() != NULL && gdk_screen_get_height(gdk_screen_get_default()) <= 600) {
 
35
+         gint oldw,oldh;
 
36
+         gtk_widget_show(scrolledWindow1024x600);
 
37
+         gtk_window_get_size(GTK_WINDOW(window),&oldw,&oldh);
 
38
+         gtk_window_resize(GTK_WINDOW (window),oldw,448);
 
39
+       }
 
40
        gtk_widget_show(window);
 
41
 }
 
42