← 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_gtkprefs.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_gtkprefs.c.patch
 
1
diff -Nur -x '*.orig' -x '*~' pidgin-2.5.4/pidgin/gtkprefs.c pidgin-2.5.4.new/pidgin/gtkprefs.c
 
2
--- pidgin-2.5.4/pidgin/gtkprefs.c      2009-01-13 03:05:39.000000000 +0800
 
3
+++ pidgin-2.5.4.new/pidgin/gtkprefs.c  2009-02-26 00:45:15.757275824 +0800
 
4
@@ -1030,6 +1030,7 @@
 
5
        GtkWidget *fontpref;
 
6
        GtkWidget *imhtml;
 
7
        GtkWidget *frame;
 
8
+       GtkWidget *scrolledWindow1024x600;
 
9
 
 
10
 #if GTK_CHECK_VERSION(2,4,0)
 
11
        GtkWidget *hbox;
 
12
@@ -1125,6 +1126,13 @@
 
13
        g_signal_connect_after(G_OBJECT(imhtml), "format_function_clear",
 
14
                                         G_CALLBACK(formatting_clear_cb), NULL);
 
15
 
 
16
+       if (gdk_screen_get_default() != NULL && gdk_screen_get_height(gdk_screen_get_default()) <= 600) {
 
17
+         scrolledWindow1024x600 = gtk_scrolled_window_new(NULL,NULL);
 
18
+         gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),GTK_POLICY_NEVER,GTK_POLICY_AUTOMATIC);
 
19
+         gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),ret);
 
20
+         gtk_widget_show(ret);
 
21
+         ret = scrolledWindow1024x600;
 
22
+       }
 
23
 
 
24
        gtk_widget_show(ret);
 
25