January 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60591 - /tags/branch-Code-11-SP1-2_17_1/autofs/
by varkoly＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: varkoly Date: Thu Jan 28 10:53:33 2010 New Revision: 60591 URL: http://svn.opensuse.org/viewcvs/yast?rev=60591&view=rev Log: Created tag branch-Code-11-SP1-2_17_1 for autofs Added: tags/branch-Code-11-SP1-2_17_1/autofs/ (props changed) - copied from r60590, branches/SuSE-Code-11-SP1-Branch/autofs/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60590 - /branches/SuSE-Code-11-SP1-Branch/autofs/VERSION
by varkoly＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: varkoly Date: Thu Jan 28 10:53:26 2010 New Revision: 60590 URL: http://svn.opensuse.org/viewcvs/yast?rev=60590&view=rev Log: SLES-SP1 VERSION Modified: branches/SuSE-Code-11-SP1-Branch/autofs/VERSION Modified: branches/SuSE-Code-11-SP1-Branch/autofs/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autof… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autofs/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/autofs/VERSION Thu Jan 28 10:53:26 2010 @@ -1 +1 @@ -2.15.4 +2.17.1 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60589 - in /branches/SuSE-Code-11-SP1-Branch/autofs: package/yast2-autofs.changes src/Autofs.pm
by varkoly＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: varkoly Date: Thu Jan 28 10:52:15 2010 New Revision: 60589 URL: http://svn.opensuse.org/viewcvs/yast?rev=60589&view=rev Log: bnc#464358 - error on console: Use of uninitialized value Modified: branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes branches/SuSE-Code-11-SP1-Branch/autofs/src/Autofs.pm Modified: branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autof… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes Thu Jan 28 10:52:15 2010 @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Thu Jan 28 10:39:39 CET 2010 - varkoly(a)novell.com -- bnc#2823 - Error message in autofs configuration is incorrect +- bnc#572823 - Error message in autofs configuration is incorrect +- bnc#464358 - error on console: Use of uninitialized value ------------------------------------------------------------------- Thu Sep 11 07:56:54 CEST 2008 - jsrain(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/autofs/src/Autofs.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autof… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autofs/src/Autofs.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/autofs/src/Autofs.pm Thu Jan 28 10:52:15 2010 @@ -210,7 +210,7 @@ y2milestone("------LDAP_CLIENT_NOT_CONFIGURED------"); return YaPI->SetError( summary => __("You must configure LDAP to use the autofs module."). "\n". - __("You can do it by using the YaST2 ldap module."), + __("You can do it by using the YaST ldap module."), code => "LDAP_CLIENT_NOT_CONFIGURED" ); } $LDAPServer = $ldapMap->{ldap_server}; @@ -467,7 +467,7 @@ $Entry->{'key'} = $all->{$dn}->{'cn'}->[0]; $Entry->{'dn'} = $dn; $Maps->{$map}->{dns}->{$dn} = 0; - my ($options,$location) = split /\s+/,$all->{$dn}->{'nismapentry'}->[0],2; + my ($options,$location) = split /\s+/,$all->{$dn}->{'nisMapEntry'}->[0],2; $Entry->{'options'} = $options; $Entry->{'location'} = $location; $Entry->{'modified'} = "0"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60588 - in /branches/SuSE-Code-11-SP1-Branch/autofs: autodocs-cc-base.ami missing
by varkoly＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: varkoly Date: Thu Jan 28 10:41:25 2010 New Revision: 60588 URL: http://svn.opensuse.org/viewcvs/yast?rev=60588&view=rev Log: bnc#2823 Modified: branches/SuSE-Code-11-SP1-Branch/autofs/autodocs-cc-base.ami branches/SuSE-Code-11-SP1-Branch/autofs/missing Modified: branches/SuSE-Code-11-SP1-Branch/autofs/autodocs-cc-base.ami URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autof… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autofs/autodocs-cc-base.ami (original) +++ branches/SuSE-Code-11-SP1-Branch/autofs/autodocs-cc-base.ami Thu Jan 28 10:41:25 2010 @@ -15,7 +15,7 @@ AUTODOCS_CC ?= $(srcdir)/../../src AUTODOCS_DEPS ?= $(AUTODOCS_CC)/*.h -html_data = index.html $(wildcard *.html *.png) doxygen.css @RPMNAME@.tag +html_data = index.html $(filter-out index.html, $(wildcard *.html *.png)) doxygen.css @RPMNAME@.tag CLEANFILES = $(html_data) doxygen.log doxygen.conf installdox doxygen.css @RPMNAME@.tag: index.html Modified: branches/SuSE-Code-11-SP1-Branch/autofs/missing URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autof… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autofs/missing (original) +++ branches/SuSE-Code-11-SP1-Branch/autofs/missing Thu Jan 28 10:41:25 2010 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60587 - in /branches/SuSE-Code-11-SP1-Branch/autofs: package/yast2-autofs.changes src/Autofs.pm
by varkoly＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: varkoly Date: Thu Jan 28 10:40:26 2010 New Revision: 60587 URL: http://svn.opensuse.org/viewcvs/yast?rev=60587&view=rev Log: bnc#2823 - Error message in autofs configuration is incorrect Modified: branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes branches/SuSE-Code-11-SP1-Branch/autofs/src/Autofs.pm Modified: branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autof… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes Thu Jan 28 10:40:26 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 28 10:39:39 CET 2010 - varkoly(a)novell.com + +- bnc#2823 - Error message in autofs configuration is incorrect + +------------------------------------------------------------------- Thu Sep 11 07:56:54 CEST 2008 - jsrain(a)suse.cz - merged texts from proofread Modified: branches/SuSE-Code-11-SP1-Branch/autofs/src/Autofs.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autof… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autofs/src/Autofs.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/autofs/src/Autofs.pm Thu Jan 28 10:40:26 2010 @@ -208,9 +208,9 @@ if( ! $ldapMap->{base_config_dn} ) { y2milestone("------LDAP_CLIENT_NOT_CONFIGURED------"); - return YaPI->SetError( summary => __("You must configure LDAP to use the autofs modul."). + return YaPI->SetError( summary => __("You must configure LDAP to use the autofs module."). "\n". - __("You can do it by using the YaST2 ldap modul."), + __("You can do it by using the YaST2 ldap module."), code => "LDAP_CLIENT_NOT_CONFIGURED" ); } $LDAPServer = $ldapMap->{ldap_server}; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60586 - in /trunk/gtk: ChangeLog src/YGPackageSelectorPluginStub.cc src/pkg/YGPackageSelector.cc src/pkg/ygtkpackageview.cc
by rpmcruz＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: rpmcruz Date: Wed Jan 27 20:42:38 2010 New Revision: 60586 URL: http://svn.opensuse.org/viewcvs/yast?rev=60586&view=rev Log: * src/pkg/YGPackageSelector.cc: added --embold-installed-row and --save-delete-buttons flags. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelectorPluginStub.cc trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/ygtkpackageview.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=60586&r1=60585… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Wed Jan 27 20:42:38 2010 @@ -1,3 +1,8 @@ +2010-01-27 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/YGPackageSelector.cc: added --embold-installed-row + and --save-delete-buttons flags. + 2010-01-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/yzyppwrapper.h/cc: changed PkgList property Modified: trunk/gtk/src/YGPackageSelectorPluginStub.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelectorPluginS… ============================================================================== --- trunk/gtk/src/YGPackageSelectorPluginStub.cc (original) +++ trunk/gtk/src/YGPackageSelectorPluginStub.cc Wed Jan 27 20:42:38 2010 @@ -23,8 +23,9 @@ undo_old_style = false, undo_log_all = false, undo_log_changed = false, undo_box = true, status_col = false, action_col = true, - action_col_as_button = false, action_col_as_check = false, action_col_label = true, + action_col_as_button = false, save_delete_buttons = false, action_col_as_check = false, action_col_label = true, version_col = true, single_line_rows = false, colorful_rows = false, + embold_installed_row = false, italicize_changed_row = false, golden_changed_row = true, details_start_hide = false, toolbar_top = false, toolbar_yast = false, arrange_by = false; @@ -63,11 +64,13 @@ { "status-col", &status_col }, { "action-col", &action_col }, { "action-col-as-button", &action_col_as_button }, + { "save-delete-buttons", &save_delete_buttons }, { "action-col-as-check", &action_col_as_check }, { "action-col-label", &action_col_label }, { "version-col", &version_col }, { "single-line-rows", &single_line_rows }, { "colorful-rows", &colorful_rows }, + { "embold-installed-row", &embold_installed_row }, { "italicize-changed-row", &italicize_changed_row }, { "golden-changed-row", &golden_changed_row }, { "details-start-hide", &details_start_hide }, Modified: trunk/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc… ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.cc (original) +++ trunk/gtk/src/pkg/YGPackageSelector.cc Wed Jan 27 20:42:38 2010 @@ -2165,7 +2165,7 @@ gtk_entry_set_icon_from_stock (GTK_ENTRY (m_entry), GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND); - gtk_entry_set_icon_activatable (GTK_ENTRY (editable), GTK_ENTRY_ICON_PRIMARY, TRUE); + gtk_entry_set_icon_activatable (GTK_ENTRY (m_entry), GTK_ENTRY_ICON_PRIMARY, TRUE); m_clearIcon = false; g_signal_connect (G_OBJECT (m_entry), "changed", @@ -2364,8 +2364,8 @@ void appendRow (GtkTreeIter *iter) { - gtk_list_store_append (m_store, &iter); - gtk_list_store_set (m_store, &iter, 0, "", 1, TRUE, 2, 0, 3, NULL, 4, TRUE, -1); + gtk_list_store_append (m_store, iter); + gtk_list_store_set (m_store, iter, 0, "", 1, TRUE, 2, 0, 3, NULL, 4, TRUE, -1); } }; @@ -2545,7 +2545,7 @@ else gtk_list_store_set (m_store, &iter, 0, repo->name.c_str(), -1); } - gtk_list_store_set (m_store, &iter, 1, TRUE, 2, repo, , + gtk_list_store_set (m_store, &iter, 1, TRUE, 2, repo, ENABLED_COLUMN, repo->enabled, -1); const gchar *icon = getRepositoryStockIcon (repo->url); @@ -3734,7 +3734,12 @@ } else { m_all_view = ygtk_package_view_new (TRUE); - m_all_view->appendCheckColumn (INSTALLED_CHECK_PROP); + if (action_col) { + if (action_col_as_button) + m_all_view->appendButtonColumn (NULL, INSTALLED_CHECK_PROP); + else // action_col_as_check + m_all_view->appendCheckColumn (INSTALLED_CHECK_PROP); + } m_all_view->appendTextColumn (_("Name"), NAME_SUMMARY_PROP, true, -1); m_all_view->appendTextColumn (_("Version"), VERSION_PROP, true, 120); m_all_view->appendTextColumn (_("Size"), SIZE_PROP, true, 80); Modified: trunk/gtk/src/pkg/ygtkpackageview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpackageview.cc?r… ============================================================================== --- trunk/gtk/src/pkg/ygtkpackageview.cc (original) +++ trunk/gtk/src/pkg/ygtkpackageview.cc Wed Jan 27 20:42:38 2010 @@ -21,7 +21,8 @@ #include <string.h> extern bool status_col, action_col, action_col_as_button, action_col_as_check, - action_col_label, version_col, colorful_rows, italicize_changed_row, + save_delete_buttons, + action_col_label, version_col, colorful_rows, embold_installed_row, italicize_changed_row, golden_changed_row, single_line_rows; //** Icons resources @@ -591,8 +592,14 @@ break; } case WEIGHT_PROP: { +#if 0 bool highlight = segment->list.highlight (package); int weight = highlight ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL; +#endif + int weight = PANGO_WEIGHT_NORMAL; + if (embold_installed_row) + if (package->isInstalled()) + weight = PANGO_WEIGHT_BOLD; g_value_set_int (value, weight); break; } @@ -617,9 +624,9 @@ if (package->toModify()) stock = GTK_STOCK_UNDO; else if (package->isInstalled()) - stock = GTK_STOCK_REMOVE; + stock = save_delete_buttons ? GTK_STOCK_DELETE : GTK_STOCK_REMOVE; else - stock = GTK_STOCK_ADD; + stock = save_delete_buttons ? GTK_STOCK_SAVE : GTK_STOCK_ADD; g_value_set_string (value, g_strdup (stock)); break; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60585 - in /trunk/gtk/src/pkg: ygtkcellrenderersidebutton.c ygtkcellrenderersidebutton.h
by rpmcruz＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: rpmcruz Date: Wed Jan 27 17:34:00 2010 New Revision: 60585 URL: http://svn.opensuse.org/viewcvs/yast?rev=60585&view=rev Log: Ups, forgot about these two. Added: trunk/gtk/src/pkg/ygtkcellrenderersidebutton.c trunk/gtk/src/pkg/ygtkcellrenderersidebutton.h Added: trunk/gtk/src/pkg/ygtkcellrenderersidebutton.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkcellrendererside… ============================================================================== --- trunk/gtk/src/pkg/ygtkcellrenderersidebutton.c (added) +++ trunk/gtk/src/pkg/ygtkcellrenderersidebutton.c Wed Jan 27 17:34:00 2010 @@ -0,0 +1,203 @@ +/******************************************************************** + * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * + ********************************************************************/ + +/* YGtkCellRendererSideButton widget */ +// check the header file for information about this widget + +#include "ygtkcellrenderersidebutton.h" +#include <gtk/gtk.h> + +enum { + PROP_0, + PROP_ACTIVE, + PROP_STOCK_ID, + PROP_BUTTON_VISIBLE, +}; + +static guint toggle_cell_signal = 0; + +G_DEFINE_TYPE (YGtkCellRendererSideButton, ygtk_cell_renderer_side_button, GTK_TYPE_CELL_RENDERER_TEXT) + +static void ygtk_cell_renderer_side_button_init (YGtkCellRendererSideButton *bcell) +{ +} + +static void free_pixbuf (YGtkCellRendererSideButton *cell) +{ + if (cell->stock_id) { + g_free (cell->stock_id); + cell->stock_id = NULL; + } + if (cell->pixbuf) { + g_object_unref (cell->pixbuf); + cell->pixbuf = NULL; + } +} + +static void ensure_pixbuf (YGtkCellRendererSideButton *cell, GtkWidget *widget) +{ + if (!cell->pixbuf && cell->stock_id) + cell->pixbuf = gtk_widget_render_icon (widget, cell->stock_id, GTK_ICON_SIZE_BUTTON, NULL); +} + +static void ygtk_cell_renderer_side_button_finalize (GObject *object) +{ + YGtkCellRendererSideButton *bcell = YGTK_CELL_RENDERER_SIDE_BUTTON (object); + free_pixbuf (bcell); + G_OBJECT_CLASS (ygtk_cell_renderer_side_button_parent_class)->finalize (object); +} + +static void ygtk_cell_renderer_side_button_get_property ( + GObject *object, guint param_id, GValue *value, GParamSpec *pspec) +{ + if (pspec->owner_type == YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON) { + YGtkCellRendererSideButton *bcell = YGTK_CELL_RENDERER_SIDE_BUTTON (object); + switch (param_id) { + case PROP_ACTIVE: + g_value_set_boolean (value, bcell->active); + break; + case PROP_STOCK_ID: + g_value_set_string (value, bcell->stock_id); + break; + case PROP_BUTTON_VISIBLE: + g_value_set_boolean (value, bcell->button_visible); + break; + } + } + else + G_OBJECT_CLASS (ygtk_cell_renderer_side_button_parent_class)->get_property ( + object, param_id, value, pspec); +} + +static void ygtk_cell_renderer_side_button_set_property (GObject *object, + guint param_id, const GValue *value, GParamSpec *pspec) +{ + if (pspec->owner_type == YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON) { + YGtkCellRendererSideButton *bcell = YGTK_CELL_RENDERER_SIDE_BUTTON (object); + switch (param_id) { + case PROP_ACTIVE: + bcell->active = g_value_get_boolean (value); + break; + case PROP_STOCK_ID: + free_pixbuf (bcell); + bcell->stock_id = g_value_dup_string (value); + break; + case PROP_BUTTON_VISIBLE: + bcell->button_visible = g_value_get_boolean (value); + break; + } + } + else + G_OBJECT_CLASS (ygtk_cell_renderer_side_button_parent_class)->set_property ( + object, param_id, value, pspec); +} + +static void ygtk_cell_renderer_side_button_get_size ( + GtkCellRenderer *cell, GtkWidget *widget, GdkRectangle *cell_area, + gint *x_offset, gint *y_offset, gint *width, gint *height) +{ + GTK_CELL_RENDERER_CLASS (ygtk_cell_renderer_side_button_parent_class)->get_size ( + cell, widget, cell_area, x_offset, y_offset, width, height); + YGtkCellRendererSideButton *bcell = YGTK_CELL_RENDERER_SIDE_BUTTON (cell); + if (bcell->button_visible) { + gint icon_width, icon_height; + gtk_icon_size_lookup (GTK_ICON_SIZE_BUTTON, &icon_width, &icon_height); + *width += icon_width + 8 + 4; + } +} + +static void ygtk_cell_renderer_side_button_render ( + GtkCellRenderer *cell, GdkDrawable *window, GtkWidget *widget, + GdkRectangle *background_area, GdkRectangle *cell_area, + GdkRectangle *expose_area, GtkCellRendererState flags) +{ + YGtkCellRendererSideButton *bcell = YGTK_CELL_RENDERER_SIDE_BUTTON (cell); + GdkRectangle text_area = *cell_area; + gint icon_width, icon_height; + if (bcell->button_visible) { + gtk_icon_size_lookup (GTK_ICON_SIZE_BUTTON, &icon_width, &icon_height); + text_area.width -= icon_width + 8 + 4; + } + GTK_CELL_RENDERER_CLASS (ygtk_cell_renderer_side_button_parent_class)->render ( + cell, window, widget, background_area, &text_area, expose_area, flags); + + if (bcell->button_visible) { + GtkStateType state = GTK_STATE_NORMAL; + GtkShadowType shadow = GTK_SHADOW_OUT; + if (!cell->sensitive || GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE) + state = GTK_STATE_INSENSITIVE; + /* else if ((flags & GTK_CELL_RENDERER_PRELIT)) + state = GTK_STATE_PRELIGHT;*/ + if (bcell->active) { + shadow = GTK_SHADOW_IN; + state = GTK_STATE_ACTIVE; + } + + GdkRectangle button_area = *cell_area; + button_area.x = cell_area->x + cell_area->width - icon_width - 8; + button_area.width = icon_width + 4; + button_area.height = icon_height + 4; + button_area.y = cell_area->y + ((cell_area->height - button_area.height) / 2); + + gtk_paint_box (widget->style, window, state, shadow, expose_area, widget, + "button", button_area.x, button_area.y, button_area.width, button_area.height); + + GdkRectangle icon_area = button_area; + icon_area.x += 2; + icon_area.y += 2; + if (bcell->active) { + cell_area->x += 2; + cell_area->y += 2; + } + + ensure_pixbuf (bcell, widget); + cairo_t *cr = gdk_cairo_create (window); + gdk_cairo_set_source_pixbuf (cr, bcell->pixbuf, icon_area.x, icon_area.y); + cairo_rectangle (cr, icon_area.x, icon_area.y, icon_width, icon_height); + cairo_fill (cr); + cairo_destroy (cr); + } +} + +static gboolean ygtk_cell_renderer_side_button_activate ( + GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, const gchar *path, + GdkRectangle *background_area, GdkRectangle *cell_area, GtkCellRendererState flags) +{ + g_signal_emit (cell, toggle_cell_signal, 0, path); + return TRUE; +} + +GtkCellRenderer *ygtk_cell_renderer_side_button_new (void) +{ return g_object_new (YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON, NULL); } + +gboolean ygtk_cell_renderer_side_button_get_active (YGtkCellRendererSideButton *cell) +{ return cell->active; } + +static void ygtk_cell_renderer_side_button_class_init (YGtkCellRendererSideButtonClass *class) +{ + GObjectClass *object_class = G_OBJECT_CLASS (class); + object_class->get_property = ygtk_cell_renderer_side_button_get_property; + object_class->set_property = ygtk_cell_renderer_side_button_set_property; + object_class->finalize = ygtk_cell_renderer_side_button_finalize; + + GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class); + cell_class->get_size = ygtk_cell_renderer_side_button_get_size; + cell_class->render = ygtk_cell_renderer_side_button_render; + cell_class->activate = ygtk_cell_renderer_side_button_activate; + + GParamFlags readwrite_flag = + G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB; + g_object_class_install_property (object_class, PROP_ACTIVE, + g_param_spec_boolean ("active", "Toggle state", "The toggle state of the button", + FALSE, readwrite_flag)); + g_object_class_install_property (object_class, PROP_STOCK_ID, + g_param_spec_string ("stock-id", "Stock ID", "Stock icon to render", NULL, readwrite_flag)); + g_object_class_install_property (object_class, PROP_BUTTON_VISIBLE, + g_param_spec_boolean ("button-visible", "Is Button Visible", "Whether to show side button", TRUE, readwrite_flag)); + + toggle_cell_signal = g_signal_new ("toggled", G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (YGtkCellRendererSideButtonClass, toggled), + NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); +} + Added: trunk/gtk/src/pkg/ygtkcellrenderersidebutton.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkcellrendererside… ============================================================================== --- trunk/gtk/src/pkg/ygtkcellrenderersidebutton.h (added) +++ trunk/gtk/src/pkg/ygtkcellrenderersidebutton.h Wed Jan 27 17:34:00 2010 @@ -0,0 +1,50 @@ +/******************************************************************** + * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * + ********************************************************************/ + +/* A icon GtkButton next to a GtkLabel. +*/ + +#ifndef YGTK_CELL_RENDERER_SIDE_BUTTON_H +#define YGTK_CELL_RENDERER_SIDE_BUTTON_H + +#include <gtk/gtkcellrenderertext.h> +G_BEGIN_DECLS + +#define YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON (ygtk_cell_renderer_side_button_get_type()) +#define YGTK_CELL_RENDERER_SIDE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON, YGtkCellRendererSideButton)) +#define YGTK_CELL_RENDERER_SIDE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ + YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON, YGtkCellRendererSideButtonClass)) +#define YGTK_IS_CELL_RENDERER_SIDE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ + YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON)) +#define YGTK_IS_CELL_RENDERER_SIDE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ + YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON)) +#define YGTK_CELL_RENDERER_SIDE_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \ + YGTK_TYPE_CELL_SIDE_RENDERER_BUTTON, YGtkCellRendererSideButtonClass)) + +typedef struct YGtkCellRendererSideButton +{ + GtkCellRendererText parent; + + // private: + guint active : 2, button_visible : 2; + gchar *stock_id; + GdkPixbuf *pixbuf; +} YGtkCellRendererSideButton; + +typedef struct YGtkCellRendererSideButtonClass +{ + GtkCellRendererTextClass parent_class; + + void (* toggled) (YGtkCellRendererSideButton *renderer, const gchar *path); +} YGtkCellRendererSideButtonClass; + +GtkCellRenderer *ygtk_cell_renderer_side_button_new (void); +GType ygtk_cell_renderer_side_button_get_type (void) G_GNUC_CONST; + +gboolean ygtk_cell_renderer_side_button_get_active (YGtkCellRendererSideButton *cell); + +G_END_DECLS +#endif + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60584 - in /branches/SuSE-Code-11-SP1-Branch/ldap-server: VERSION package/yast2-ldap-server.changes
by rhafer＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: rhafer Date: Wed Jan 27 17:07:48 2010 New Revision: 60584 URL: http://svn.opensuse.org/viewcvs/yast?rev=60584&view=rev Log: preparing 2.17.29 Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION Wed Jan 27 17:07:48 2010 @@ -1 +1 @@ -2.17.28 +2.17.29 Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Wed Jan 27 17:07:48 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jan 27 16:04:15 UTC 2010 - rhafer(a)novell.com + +- Version 2.17.29 +- merged proofreading results (bnc#574234, bnc#574305, bnc#574364) +- When changing ACL, ensure that syncrepl ACL is always the first + ACL (bnc#574346) + +------------------------------------------------------------------- Mon Jan 11 13:21:12 UTC 2010 - rhafer(a)novell.com - Version 2.17.28 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60583 - /branches/SuSE-Code-11-SP1-Branch/ldap-server/src/helps.ycp
by rhafer＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: rhafer Date: Wed Jan 27 17:03:39 2010 New Revision: 60583 URL: http://svn.opensuse.org/viewcvs/yast?rev=60583&view=rev Log: more proofreading fixes (bnc#574364) Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/helps.ycp Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/helps.ycp Wed Jan 27 17:03:39 2010 @@ -149,7 +149,7 @@ _("<h4>Session log</h4>") + _("<p>Configures an in-memory session log for recording information about write operations made on the database. Specify how many write operation should be recorded in the session log. -Configuring a session log does only make sense when \"<i>refreshOnly</i>\" replication is used. In +Configuring a session log is only useful for \"<i>refreshOnly</i>\" replication. In such a case it can speed up replication and reduce the load on the master server.</p>"), "synccons_edit" : -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60582 - /branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm
by rhafer＠svn.opensuse.org 27 Jan '10

27 Jan '10

Author: rhafer Date: Wed Jan 27 17:03:37 2010 New Revision: 60582 URL: http://svn.opensuse.org/viewcvs/yast?rev=60582&view=rev Log: Assure that syncrepl ACL is always the first ACL (bnc#574346) Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm Wed Jan 27 17:03:37 2010 @@ -1947,6 +1947,54 @@ { my ($self, $dbIndex, $acllist ) = @_; y2debug("ChangeDatabaseAcl: ".Data::Dumper->Dump([$acllist]) ); + + # Check whether this is a slave database, if yes locate the + # syncrepl related ACL and move it to the top. This is to ensure + # that syncrepl clients have read access to everything + my $syncrepl = $self->ReadSyncRepl( $dbIndex ); + if ( $syncrepl && scalar(keys %{$syncrepl}) && $syncrepl->{'binddn'} ne "" ) + { + my $acllist_sorted=[]; + my $syncacl={}; + my $found=0; + + foreach my $rule ( @{$acllist} ) + { + if ( !$found && (keys %{$rule->{'target'}} == 0) ) + { + # this rule matches all db entries, check if it gives + # read access to the syncrepl id + foreach my $access ( @{$rule->{'access'}} ) + { + if ( $access->{'type'} eq "dn.base" && + lc($access->{'value'}) eq lc($syncrepl->{'binddn'} ) && + ($access->{'level'} eq "read" || $access->{'level'} eq "write") + ) + { + y2milestone("Found syncrepl ACL, moving to first position"); + $syncacl=$rule; + $found=1; + last; + } + } + if( $found ) + { + next; + } + } + push @{$acllist_sorted}, $rule; + } + if ( $found ) + { + # push syncrepl acl on top + push @{$acllist_sorted}, $syncacl; + $acllist = [ $syncacl ]; + push @{$acllist}, @{$acllist_sorted}; + } + } + + + my $rc = SCR->Write(".ldapserver.database.{".$dbIndex."}.acl", $acllist ); if ( ! $rc ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0