now yuo can change styles again! (oops) wasnt saving teh nwe style file to the Resour...

diff --git a/src/Iconmenu.cc b/src/Iconmenu.cc
index cf29c193609b9909dcf496ba51ab9e2ac90b0c86..0adc10a75c8818ecc57ce5d8e04fd54957a1dfb0 100644 (file)
--- a/src/Iconmenu.cc
+++ b/src/Iconmenu.cc
@@ -1,4 +1,4 @@
-// Icon.cc for Openbox
+// Iconmenu.cc for Openbox
 // Copyright (c) 2001 Sean 'Shaleh' Perry <shaleh@debian.org>
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //

diff --git a/src/Iconmenu.h b/src/Iconmenu.h
index dcac036c29582e777240166101769f8d36146bcc..609f03a32c7f7e4f09091d3f19ab6ce9dca9401b 100644 (file)
--- a/src/Iconmenu.h
+++ b/src/Iconmenu.h
@@ -1,4 +1,4 @@
-// Icon.h for Openbox
+// Iconmenu.h for Openbox
 // Copyright (c) 2001 Sean 'Shaleh' Perry <shaleh@debian.org>
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //

diff --git a/src/Rootmenu.cc b/src/Rootmenu.cc
index 59bfb1cfac89b505098b0b4c0deb8e01ee13820a..2bda207074bd3fc3d77b1513af6b680206334251 100644 (file)
--- a/src/Rootmenu.cc
+++ b/src/Rootmenu.cc
@@ -102,7 +102,7 @@ void Rootmenu::itemSelected(int button, int index) {
 
   case BScreen::SetStyle:
     if (item->exec())
-      openbox.saveStyleFilename(item->exec());
+      openbox.setStyleFilename(item->exec());
 
   case BScreen::Reconfigure:
     openbox.reconfigure();

diff --git a/src/Screen.cc b/src/Screen.cc
index 3d1932954fefca2765718e598d9ef38638bcd795..313aeb21e8efa2c9a053832334f2d47298b50759 100644 (file)
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -2160,7 +2160,7 @@ void BScreen::InitMenu(void) {
     rootmenu->insert(i18n->getMessage(ScreenSet, ScreenExit, "Exit"),
                     BScreen::Exit);
   } else {
-    openbox.saveMenuFilename(openbox.getMenuFilename());
+    openbox.setMenuFilename(openbox.getMenuFilename());
   }
 }
 
@@ -2361,7 +2361,7 @@ Bool BScreen::parseMenuFile(FILE *file, Rootmenu *menu) {
 
                if (! feof(submenufile)) {
                  if (! parseMenuFile(submenufile, menu))
-                   openbox.saveMenuFilename(newfile);
+                   openbox.setMenuFilename(newfile);
 
                  fclose(submenufile);
                }
@@ -2520,7 +2520,7 @@ Bool BScreen::parseMenuFile(FILE *file, Rootmenu *menu) {
                   rootmenuList->insert(stylesmenu);
                 }
 
-                openbox.saveMenuFilename(stylesdir);
+                openbox.setMenuFilename(stylesdir);
               } else {
                 fprintf(stderr, i18n->getMessage(ScreenSet,
                                                 ScreenSTYLESDIRErrorNotDir,

diff --git a/src/openbox.cc b/src/openbox.cc
index 25d274f1ae60e7425d3ee9773fa351618be3a814..dff6810222594f227c9e0dc6d2bed59080dcb403 100644 (file)
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -1137,15 +1137,16 @@ void Openbox::real_rereadMenu() {
 }
 
 
-void Openbox::saveStyleFilename(const char *filename) {
+void Openbox::setStyleFilename(const char *filename) {
   if (resource.style_file)
     delete [] resource.style_file;
 
   resource.style_file = bstrdup(filename);
+  config.setValue("session.styleFile", resource.style_file);
 }
 
 
-void Openbox::saveMenuFilename(const char *filename) {
+void Openbox::setMenuFilename(const char *filename) {
   Bool found = False;
 
   LinkedListIterator<MenuTimestamp> it(menuTimestamps);

diff --git a/src/openbox.h b/src/openbox.h
index 144888bbcdb7d508c4100e1ad8cc906e9598fd4c..eae8bcff544f1901a42811711d11ac9489e684cb 100644 (file)
--- a/src/openbox.h
+++ b/src/openbox.h
@@ -178,8 +178,8 @@ public:
 
   void setFocusedWindow(OpenboxWindow *w);
   void shutdown();
-  void saveStyleFilename(const char *);
-  void saveMenuFilename(const char *);
+  void setStyleFilename(const char *);
+  void setMenuFilename(const char *);
   void saveMenuSearch(Window, Basemenu *);
   void saveWindowSearch(Window, OpenboxWindow *);
   void saveToolbarSearch(Window, Toolbar *);