File lxappearance-obconf-fix-incomplete-rename.patch of Package lxappearance-obconf

From bfe4346d76ed3e796c84de5337269e7e82cee13f Mon Sep 17 00:00:00 2001
From: Guido Berhoerster <gber@opensuse.org>
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