[Xfce4-commits] <ristretto:ristretto-0.0> Merge branch 'master' into new_picture_viewer

[Stephan Arts]

Updating branch refs/heads/ristretto-0.0
         to c2e9b6b2e7c036f6e144318f9856ed44c28e69ae (commit)
       from d4e2a5d7d9d203d5477a3dad227c1d7849b80df4 (commit)

commit c2e9b6b2e7c036f6e144318f9856ed44c28e69ae
Merge: d4e2a5d 3f8ba01
Author: Stephan Arts <stephan at thor.(none)>
Date:   Sat Feb 21 09:26:25 2009 +0100

    Merge branch 'master' into new_picture_viewer

commit 3f8ba01f6df517764a03802d145dfcf18bf14fbc
Author: Stephan Arts <stephan at thor.(none)>
Date:   Sat Feb 21 09:22:56 2009 +0100

    Remove autogenerated header file from git

 src/main_window_ui.h |   37 -------------------------------------
 1 files changed, 0 insertions(+), 37 deletions(-)

diff --git a/src/main_window_ui.h b/src/main_window_ui.h
deleted file mode 100644
index e66253c..0000000
--- a/src/main_window_ui.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* automatically generated from main_window_ui.xml */
-#ifdef __SUNPRO_C
-#pragma align 4 (main_window_ui)
-#endif
-#ifdef __GNUC__
-static const char main_window_ui[] __attribute__ ((__aligned__ (4))) =
-#else
-static const char main_window_ui[] =
-#endif
-{
-  "<ui><menubar name=\"main-menu\"><menu action=\"file-menu\"><menuitem ac"
-  "tion=\"open\"/><menuitem action=\"open-folder\"/><menu action=\"open-re"
-  "cent-menu\"><placeholder name=\"placeholder-open-recent\"/></menu><sepa"
-  "rator/><menuitem action=\"file-properties\"/><separator/><menuitem acti"
-  "on=\"close\"/><menuitem action=\"close-all\"/><menuitem action=\"quit\""
-  "/></menu><menu action=\"edit-menu\"><menu action=\"open-with-menu\"><pl"
-  "aceholder name=\"open-with-apps\" /></menu><separator/><menuitem action"
-  "=\"preferences\"/></menu><menu action=\"view-menu\"><menuitem action=\""
-  "show-toolbar\"/><menuitem action=\"show-thumbnailbar\"/><separator/><me"
-  "nu action=\"zoom-menu\"><menuitem action=\"zoom-in\"/><menuitem action="
-  "\"zoom-out\"/><menuitem action=\"zoom-fit\"/><menuitem action=\"zoom-10"
-  "0\"/></menu><menu action=\"rotation-menu\"><menuitem action=\"rotate-cw"
-  "\"/><menuitem action=\"rotate-ccw\"/></menu><separator/><menuitem actio"
-  "n=\"fullscreen\"/><menuitem action=\"set-as-wallpaper\"/></menu><menu a"
-  "ction=\"go-menu\"><menuitem action=\"back\"/><menuitem action=\"forward"
-  "\"/><menuitem action=\"first\"/><menuitem action=\"last\"/><separator/>"
-  "<placeholder name=\"placeholder-slideshow\" /></menu><menu action=\"hel"
-  "p-menu\"><menuitem action=\"contents\"/><menuitem action=\"about\"/></m"
-  "enu></menubar><toolbar name=\"main-toolbar\"><toolitem action=\"open\"/"
-  "><separator /><toolitem action=\"back\"/><toolitem action=\"forward\"/>"
-  "<separator name=\"placeholder-1\"/><toolitem action=\"zoom-in\"/><tooli"
-  "tem action=\"zoom-out\"/><toolitem action=\"zoom-100\"/><toolitem actio"
-  "n=\"zoom-fit\"/></toolbar></ui>"
-};
-
-static const unsigned main_window_ui_length = 1503u;
-