commit lxappearance-obconf for openSUSE:Factory

Hello community, here is the log from the commit of package lxappearance-obconf for openSUSE:Factory checked in at Fri Sep 9 11:46:02 CEST 2011. -------- --- lxappearance-obconf/lxappearance-obconf.changes 2011-07-25 00:21:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/lxappearance-obconf/lxappearance-obconf.changes 2011-08-14 17:38:38.000000000 +0200 @@ -1,0 +2,11 @@ +Sun Aug 14 15:35:30 UTC 2011 - gber@opensuse.org + +- update to latest git snapshot (0.1.1.99+git20110814) + - Openbox 3.5 support +- added missing authors, license, and readme file +- added lxappearance-obconf-fix-error-handling.patch to correctly + handle errors when saving config files +- added lxappearance-obconf-fix-incomplete-rename.patch in order to + fix the incomplete renaming of symbols + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- lxappearance-obconf-0.0.1.tar.bz2 New: ---- lxappearance-obconf-0.1.1.99+git20110814.tar.bz2 lxappearance-obconf-fix-error-handling.patch lxappearance-obconf-fix-incomplete-rename.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxappearance-obconf.spec ++++++ --- /var/tmp/diff_new_pack.TuC2ul/_old 2011-09-09 11:45:56.000000000 +0200 +++ /var/tmp/diff_new_pack.TuC2ul/_new 2011-09-09 11:45:56.000000000 +0200 @@ -19,18 +19,21 @@ Name: lxappearance-obconf -Summary: Lxappearance plugin to configure openbox -Version: 0.0.1 +Summary: Lxappearance Plugin to Configure Openbox +Version: 0.1.1.99+git20110814 Release: 1 License: GPLv2 Group: System/GUI/LXDE Url: http://www.lxde.org/ Source0: %name-%version.tar.bz2 +Patch0: %name-fix-error-handling.patch +Patch1: %name-fix-incomplete-rename.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: intltool pkg-config +BuildRequires: intltool +BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(lxappearance) -BuildRequires: pkgconfig(obrender-3.0) -BuildRequires: pkgconfig(obparser-3.0) +BuildRequires: pkgconfig(obrender-3.5) +BuildRequires: pkgconfig(obt-3.5) Requires: lxappearance Requires: openbox @@ -46,10 +49,13 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build +./autogen.sh %configure -%__make %{?jobs:-j%{jobs}} V=1 +%__make %{_smp_mflags} V=1 %install %makeinstall @@ -61,6 +67,7 @@ %files -f %name.lang %defattr(-,root,root) +%doc AUTHORS CHANGELOG COPYING README %_libdir/lxappearance/plugins %dir %_datadir/lxappearance/obconf %_datadir/lxappearance/obconf/obconf.glade ++++++ lxappearance-obconf-fix-error-handling.patch ++++++

From 8814f63788b4c5cddd508a9f3226a8f89a201de7 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Sun, 14 Aug 2011 17:20:28 +0200 Subject: [PATCH 1/2] fix error handling when saving the config file in tree_apply()

--- src/tree.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/tree.c b/src/tree.c index f6cd532..071bf6a 100644 --- a/src/tree.c +++ b/src/tree.c @@ -97,7 +97,6 @@ void tree_delete_node(const gchar *path) void tree_apply() { gchar *p, *d; - gboolean err; if (obc_config_file) p = g_strdup(obc_config_file); @@ -109,16 +108,7 @@ void tree_apply() obt_paths_mkdir_path(d, 0700); g_free(d); - if (!obt_xml_save_file(xml_i, p, TRUE)) { - gchar *s; - s = g_strdup_printf("An error occured while saving the " - "config file '%s'", p); - obconf_error(s, FALSE); - g_free(s); - } - g_free(p); - - if (!err) { + if (obt_xml_save_file(xml_i, p, TRUE)) { XEvent ce; ce.xclient.type = ClientMessage; @@ -134,7 +124,14 @@ void tree_apply() XSendEvent(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), GDK_ROOT_WINDOW(), FALSE, SubstructureNotifyMask | SubstructureRedirectMask, &ce); + } else { + gchar *s; + s = g_strdup_printf("An error occured while saving the " + "config file '%s'", p); + obconf_error(s, FALSE); + g_free(s); } + g_free(p); } void tree_set_string(const gchar *node, const gchar *value) -- 1.7.3.4 ++++++ lxappearance-obconf-fix-incomplete-rename.patch ++++++

From bfe4346d76ed3e796c84de5337269e7e82cee13f Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Sun, 14 Aug 2011 17:21:06 +0200 Subject: [PATCH 2/2] fix the incomplete rename started with 966cb46f0ad5420ee4dc44619012cc5301fb6051

--- src/appearance.c | 8 ++++---- src/main.c | 4 ++-- src/preview.c | 10 +++++----- src/preview.h | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/appearance.c b/src/appearance.c index 2204007..aa07755 100644 --- a/src/appearance.c +++ b/src/appearance.c @@ -86,11 +86,11 @@ void appearance_setup_tab() w = get_widget("font_active_display"); f = read_font(GTK_FONT_BUTTON(w), "OnScreenActiveDisplay"); - preview_update_set_active_osd_font(f); + preview_update_set_osd_active_font(f); w = get_widget("font_incative_display"); f = read_font(GTK_FONT_BUTTON(w), "OnScreenIactiveDisplay"); - preview_update_set_active_osd_font(f); + preview_update_set_osd_active_font(f); mapping = FALSE; } @@ -193,14 +193,14 @@ void on_font_active_display_font_set(GtkFontButton *w, gpointer data) { if (mapping) return; - preview_update_set_active_osd_font(write_font(w, "OnScreenActiveDisplay")); + preview_update_set_osd_active_font(write_font(w, "OnScreenActiveDisplay")); } void on_font_inactive_display_font_set(GtkFontButton *w, gpointer data) { if (mapping) return; - preview_update_set_inactive_osd_font(write_font(w, "OnScreenInactiveDisplay")); + preview_update_set_osd_inactive_font(write_font(w, "OnScreenInactiveDisplay")); } static RrFont *read_font(GtkFontButton *w, const gchar *place) diff --git a/src/main.c b/src/main.c index 00525b4..262f9a8 100644 --- a/src/main.c +++ b/src/main.c @@ -239,8 +239,8 @@ extern void plugin_unload(LXAppearance* app) preview_update_set_inactive_font(NULL); preview_update_set_menu_header_font(NULL); preview_update_set_menu_item_font(NULL); - preview_update_set_active_osd_font(NULL); - preview_update_set_inactive_osd_font(NULL); + preview_update_set_osd_active_font(NULL); + preview_update_set_osd_inactive_font(NULL); preview_update_set_title_layout(NULL); RrInstanceFree(rrinst); diff --git a/src/preview.c b/src/preview.c index e9549d5..72e3cbf 100644 --- a/src/preview.c +++ b/src/preview.c @@ -38,8 +38,8 @@ GdkPixbuf *preview_theme(const gchar *name, const gchar *titlelayout, RrFont *inactive_window_font, RrFont *menu_title_font, RrFont *menu_item_font, - RrFont *active_osd_font, - RrFont *inactive_osd_font); + RrFont *osd_active_font, + RrFont *osd_inactive_font); /* End forwarded */ @@ -780,8 +780,8 @@ GdkPixbuf *preview_theme(const gchar *name, const gchar *titlelayout, RrFont *inactive_window_font, RrFont *menu_title_font, RrFont *menu_item_font, - RrFont *active_osd_font, - RrFont *inactive_osd_font) + RrFont *osd_active_font, + RrFont *osd_inactive_font) { GdkPixbuf *preview; @@ -796,7 +796,7 @@ GdkPixbuf *preview_theme(const gchar *name, const gchar *titlelayout, RrTheme *theme = RrThemeNew(rrinst, name, FALSE, active_window_font, inactive_window_font, menu_title_font, menu_item_font, - active_osd_font, inactive_osd_font); + osd_active_font, osd_inactive_font); if (!theme) return NULL; diff --git a/src/preview.h b/src/preview.h index 0d59205..801fc6f 100644 --- a/src/preview.h +++ b/src/preview.h @@ -29,7 +29,7 @@ GdkPixbuf *preview_theme(const gchar *name, const gchar *titlelayout, RrFont *inactive_window_font, RrFont *menu_title_font, RrFont *menu_item_font, - RrFont *active_osd_font, - RrFont *inactive_osd_font); + RrFont *osd_active_font, + RrFont *osd_inactive_font); #endif -- 1.7.3.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org