From 6a73e91e55150e53c5b9171df050d107070e84d9 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 30 Jan 2009 09:20:41 +0000 Subject: [PATCH] kes Fix a text sizing problem in the tray-monitor reported in bug #1219, with patch included. + reorganize patches git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8414 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/AUTHORS | 1 + bacula/patches/2.4.4-reload.patch | 13 ++++ bacula/patches/2.4.4-tray-sizing.patch | 59 +++++++++++++++++++ bacula/patches/{ => 2.4.x}/2.4.3-getmsg.patch | 0 bacula/patches/{ => 2.4.x}/2.4.3-jobs.patch | 0 .../{ => 2.4.x}/2.4.3-migrate-log.patch | 0 .../patches/{ => 2.4.x}/2.4.3-migrate.patch | 0 .../patches/{ => 2.4.x}/2.4.3-migrate2.patch | 0 .../{ => 2.4.x}/2.4.3-orphaned-jobs.patch | 0 bacula/patches/{ => 2.4.x}/2.4.3-prune.patch | 0 .../patches/{ => 2.4.x}/2.4.3-purge-bug.patch | 0 .../2.4.3-win32-runscript-unicode-path.patch | 0 bacula/src/tray-monitor/tray-monitor.c | 11 +++- 13 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 bacula/patches/2.4.4-tray-sizing.patch rename bacula/patches/{ => 2.4.x}/2.4.3-getmsg.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.3-jobs.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.3-migrate-log.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.3-migrate.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.3-migrate2.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.3-orphaned-jobs.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.3-prune.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.3-purge-bug.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.3-win32-runscript-unicode-path.patch (100%) diff --git a/bacula/AUTHORS b/bacula/AUTHORS index 0d6d9554f9..e6e181f278 100644 --- a/bacula/AUTHORS +++ b/bacula/AUTHORS @@ -99,6 +99,7 @@ Tim Oberfoell Tomas Cameron Tullio Andreatta Ulrich Leodolter +Vitaliy Kosharskiy Wolfgang Denk Yuri Timofeev Yves Orton diff --git a/bacula/patches/2.4.4-reload.patch b/bacula/patches/2.4.4-reload.patch index 72a6867a3a..367a0d6dad 100644 --- a/bacula/patches/2.4.4-reload.patch +++ b/bacula/patches/2.4.4-reload.patch @@ -1,3 +1,16 @@ + + This patch fixes bug #1211 crash during reload with bad dird.conf file. + + Apply it to version 2.4.4 with: + + cd + patch -p0 <2.4.4-reload.patch + ./configure + make + ... + make install + + Index: src/lib/parse_conf.c =================================================================== --- src/lib/parse_conf.c (revision 8393) diff --git a/bacula/patches/2.4.4-tray-sizing.patch b/bacula/patches/2.4.4-tray-sizing.patch new file mode 100644 index 0000000000..abeffb7343 --- /dev/null +++ b/bacula/patches/2.4.4-tray-sizing.patch @@ -0,0 +1,59 @@ + + This patch fixes a text sizing problem in the tray-monitor. + It fixes bug #1219. + + Apply it to version 2.4.4 with: + + cd + patch -p0 <2.4.4-tray-sizing.patch + ./configure + make + ... + make install + + +Index: src/tray-monitor/tray-monitor.c +=================================================================== +--- src/tray-monitor/tray-monitor.c (revision 8393) ++++ src/tray-monitor/tray-monitor.c (working copy) +@@ -1,7 +1,7 @@ + /* + Bacula® - The Network Backup Solution + +- Copyright (C) 2004-2007 Free Software Foundation Europe e.V. ++ Copyright (C) 2004-2009 Free Software Foundation Europe e.V. + + The main author of Bacula is Kern Sibbald, with contributions from + many others, a complete list can be found in the file AUTHORS. +@@ -97,6 +97,7 @@ + static GtkWidget *textview; + static GtkTextBuffer *buffer; + static GtkWidget *timeoutspinner; ++static GtkWidget *scrolledWindow; + char** xpm_generic_var; + static gboolean blinkstate = TRUE; + +@@ -409,9 +410,13 @@ + } + + gtk_box_pack_start(GTK_BOX(vbox), daemon_table, FALSE, FALSE, 0); +- ++ + textview = gtk_text_view_new(); + ++ scrolledWindow = gtk_scrolled_window_new(NULL, NULL); ++ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); ++ gtk_container_add(GTK_CONTAINER (scrolledWindow), textview); ++ + buffer = gtk_text_buffer_new(NULL); + + gtk_text_buffer_set_text(buffer, "", -1); +@@ -456,7 +461,7 @@ + + gtk_text_view_set_buffer(GTK_TEXT_VIEW(textview), buffer); + +- gtk_box_pack_start(GTK_BOX(vbox), textview, TRUE, TRUE, 0); ++ gtk_box_pack_start(GTK_BOX(vbox), scrolledWindow, TRUE, TRUE, 0); + + GtkWidget* hbox = gtk_hbox_new(FALSE, 10); + diff --git a/bacula/patches/2.4.3-getmsg.patch b/bacula/patches/2.4.x/2.4.3-getmsg.patch similarity index 100% rename from bacula/patches/2.4.3-getmsg.patch rename to bacula/patches/2.4.x/2.4.3-getmsg.patch diff --git a/bacula/patches/2.4.3-jobs.patch b/bacula/patches/2.4.x/2.4.3-jobs.patch similarity index 100% rename from bacula/patches/2.4.3-jobs.patch rename to bacula/patches/2.4.x/2.4.3-jobs.patch diff --git a/bacula/patches/2.4.3-migrate-log.patch b/bacula/patches/2.4.x/2.4.3-migrate-log.patch similarity index 100% rename from bacula/patches/2.4.3-migrate-log.patch rename to bacula/patches/2.4.x/2.4.3-migrate-log.patch diff --git a/bacula/patches/2.4.3-migrate.patch b/bacula/patches/2.4.x/2.4.3-migrate.patch similarity index 100% rename from bacula/patches/2.4.3-migrate.patch rename to bacula/patches/2.4.x/2.4.3-migrate.patch diff --git a/bacula/patches/2.4.3-migrate2.patch b/bacula/patches/2.4.x/2.4.3-migrate2.patch similarity index 100% rename from bacula/patches/2.4.3-migrate2.patch rename to bacula/patches/2.4.x/2.4.3-migrate2.patch diff --git a/bacula/patches/2.4.3-orphaned-jobs.patch b/bacula/patches/2.4.x/2.4.3-orphaned-jobs.patch similarity index 100% rename from bacula/patches/2.4.3-orphaned-jobs.patch rename to bacula/patches/2.4.x/2.4.3-orphaned-jobs.patch diff --git a/bacula/patches/2.4.3-prune.patch b/bacula/patches/2.4.x/2.4.3-prune.patch similarity index 100% rename from bacula/patches/2.4.3-prune.patch rename to bacula/patches/2.4.x/2.4.3-prune.patch diff --git a/bacula/patches/2.4.3-purge-bug.patch b/bacula/patches/2.4.x/2.4.3-purge-bug.patch similarity index 100% rename from bacula/patches/2.4.3-purge-bug.patch rename to bacula/patches/2.4.x/2.4.3-purge-bug.patch diff --git a/bacula/patches/2.4.3-win32-runscript-unicode-path.patch b/bacula/patches/2.4.x/2.4.3-win32-runscript-unicode-path.patch similarity index 100% rename from bacula/patches/2.4.3-win32-runscript-unicode-path.patch rename to bacula/patches/2.4.x/2.4.3-win32-runscript-unicode-path.patch diff --git a/bacula/src/tray-monitor/tray-monitor.c b/bacula/src/tray-monitor/tray-monitor.c index dab4c2f568..dd5d6644bf 100644 --- a/bacula/src/tray-monitor/tray-monitor.c +++ b/bacula/src/tray-monitor/tray-monitor.c @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2004-2008 Free Software Foundation Europe e.V. + Copyright (C) 2004-2009 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -99,6 +99,7 @@ static GtkWidget *window; static GtkWidget *textview; static GtkTextBuffer *buffer; static GtkWidget *timeoutspinner; +static GtkWidget *scrolledWindow; char** xpm_generic_var; static gboolean blinkstate = TRUE; @@ -417,9 +418,13 @@ int main(int argc, char *argv[]) } gtk_box_pack_start(GTK_BOX(vbox), daemon_table, FALSE, FALSE, 0); - + textview = gtk_text_view_new(); + scrolledWindow = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_container_add(GTK_CONTAINER (scrolledWindow), textview); + buffer = gtk_text_buffer_new(NULL); gtk_text_buffer_set_text(buffer, "", -1); @@ -464,7 +469,7 @@ int main(int argc, char *argv[]) gtk_text_view_set_buffer(GTK_TEXT_VIEW(textview), buffer); - gtk_box_pack_start(GTK_BOX(vbox), textview, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox), scrolledWindow, TRUE, TRUE, 0); GtkWidget* hbox = gtk_hbox_new(FALSE, 10); -- 2.39.5