From 0e0532028906b96f92fa33e5d77287271e5adb54 Mon Sep 17 00:00:00 2001 From: Fabien Vantard Date: Mon, 22 Jan 2007 21:06:25 +0000 Subject: [PATCH] 2007-01-22 [fabien] 2.7.1cvs51 * src/gtk/gtkutils.c gtkut_get_options_frame() : ability to pass a 'NULL' value in frame pointer parameter if we don't need it. --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/gtk/gtkutils.c | 30 +++++++++++++++++++++--------- 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f86027b7..cd25a0a94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-01-22 [fabien] 2.7.1cvs51 + + * src/gtk/gtkutils.c + gtkut_get_options_frame() : ability to pass + a 'NULL' value in frame pointer parameter if + we don't need it. + 2007-01-22 [colin] 2.7.1cvs50 * src/procmsg.c diff --git a/PATCHSETS b/PATCHSETS index 76e5e4b87..452eb5545 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2308,3 +2308,4 @@ ( cvs diff -u -r 1.3.2.13 -r 1.3.2.14 src/ldapquery.c; cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/ldapquery.h; ) > 2.7.1cvs48.patchset ( cvs diff -u -r 1.3.2.14 -r 1.3.2.15 src/ldapquery.c; cvs diff -u -r 1.4.2.8 -r 1.4.2.9 src/ldapquery.h; ) > 2.7.1cvs49.patchset ( cvs diff -u -r 1.150.2.89 -r 1.150.2.90 src/procmsg.c; cvs diff -u -r 1.60.2.39 -r 1.60.2.40 src/procmsg.h; cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/plugins/bogofilter/bogofilter.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/plugins/bogofilter/bogofilter_gtk.c; cvs diff -u -r 1.18.2.46 -r 1.18.2.47 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.23.2.35 -r 1.23.2.36 src/plugins/spamassassin/spamassassin_gtk.c; ) > 2.7.1cvs50.patchset +( cvs diff -u -r 1.5.2.49 -r 1.5.2.50 src/gtk/gtkutils.c; ) > 2.7.1cvs51.patchset diff --git a/configure.ac b/configure.ac index 760f13949..a19830fc3 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=7 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=50 +EXTRA_VERSION=51 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c index 4ff82521b..05081b591 100644 --- a/src/gtk/gtkutils.c +++ b/src/gtk/gtkutils.c @@ -1017,21 +1017,33 @@ GtkWidget *gtkut_get_replace_btn(const gchar *button_label) return button; } -GtkWidget *gtkut_get_options_frame(GtkWidget *box, GtkWidget **frame, +/** + * merge some part of code into one function : it creates a frame and add + * these into gtk box widget passed in param. + * \param box gtk box where adding new created frame. + * \param pframe pointer with which to assign the frame. If NULL, no pointer + * is assigned but the frame is anyway created and added to @box. + * \param frame_label frame label of new created frame. + */ +GtkWidget *gtkut_get_options_frame(GtkWidget *box, GtkWidget **pframe, const gchar *frame_label) { GtkWidget *vbox; - - *frame = gtk_frame_new(frame_label); - gtk_widget_show(*frame); - gtk_box_pack_start(GTK_BOX(box), *frame, FALSE, TRUE, 0); - gtk_frame_set_label_align(GTK_FRAME(*frame), 0.01, 0.5); - + GtkWidget *frame; + + frame = gtk_frame_new(frame_label); + gtk_widget_show(frame); + gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0); + gtk_frame_set_label_align(GTK_FRAME(frame), 0.01, 0.5); + vbox = gtk_vbox_new (FALSE, 4); gtk_widget_show(vbox); - gtk_container_add(GTK_CONTAINER (*frame), vbox); + gtk_container_add(GTK_CONTAINER (frame), vbox); gtk_container_set_border_width (GTK_CONTAINER (vbox), 8); - + + if (pframe != NULL) + *pframe = frame; + return vbox; } -- 2.25.1