org.handhelds.familiar/packages/gaim/files/08-prefs-dialog.patch

   1 --- gaim.ori/src/gtkprefs.c     2005-09-05 08:28:17.000000000 +0200
   2 +++ gaim/src/gtkprefs.c 2005-09-05 09:06:27.000000000 +0200
   3 @@ -2108,12 +2108,18 @@
   4         if (icon)
   5                 g_object_unref(icon);
   6
   7 -#if GTK_CHECK_VERSION(2,4,0)
   8 -       return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text));
   9 -#else
  10 -       gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text));
  11 -       return gtk_notebook_page_num(GTK_NOTEBOOK(prefsnotebook), page);
  12 -#endif
  13 +       //Add a scrolled window around the page contents
  14 +       GtkWidget *sw;
  15 +       sw = gtk_scrolled_window_new(NULL, NULL);
  16 +       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
  17 +               GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
  18 +       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
  19 +               GTK_SHADOW_NONE);
  20 +       //gtk_widget_set_size_request(sw, -1, 200);
  21 +       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), page);
  22 +
  23 +
  24 +       return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), sw, gtk_label_new(text));
  25  }
  26
  27  static void prefs_notebook_init() {
  28 @@ -2146,9 +2152,9 @@
  29  void gaim_gtk_prefs_show(void)
  30  {
  31         GtkWidget *vbox;
  32 -       GtkWidget *bbox;
  33 +       //GtkWidget *bbox;
  34         GtkWidget *notebook;
  35 -       GtkWidget *button;
  36 +       //GtkWidget *button;
  37
  38         if (prefs) {
  39                 gtk_window_present(GTK_WINDOW(prefs));
  40 @@ -2176,11 +2182,13 @@
  41
  42         /* The notebook */
  43         prefsnotebook = notebook = gtk_notebook_new ();
  44 -       gtk_box_pack_start (GTK_BOX (vbox), notebook, FALSE, FALSE, 0);
  45 +       gtk_notebook_set_scrollable(GTK_NOTEBOOK(prefsnotebook), TRUE);
  46 +       gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0);
  47
  48
  49         /* The buttons to press! */
  50 -       bbox = gtk_hbutton_box_new();
  51 +       //To save screen estate we will do without a close button
  52 +       /*bbox = gtk_hbutton_box_new();
  53         gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE);
  54         gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
  55         gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
  56 @@ -2190,7 +2198,7 @@
  57         g_signal_connect_swapped(G_OBJECT(button), "clicked",
  58                                                          G_CALLBACK(gtk_widget_destroy), prefs);
  59         gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
  60 -       gtk_widget_show(button);
  61 +       gtk_widget_show(button);*/
  62
  63         prefs_notebook_init();
  64