| db730b17 |
1 | diff -r -u littlewizard-1.1.5/include/environment.h littlewizard-1.1.5.new/include/environment.h |
| 2 | --- littlewizard-1.1.5/include/environment.h 2005-09-11 21:17:23.000000000 +0200 |
| 3 | +++ littlewizard-1.1.5.new/include/environment.h 2007-09-25 07:16:06.009362586 +0200 |
| 4 | @@ -44,7 +44,7 @@ |
| 5 | static xmlNode *initializeXMLTree (xmlDocPtr &doc); |
| 6 | static void clear(); |
| 7 | public: |
| 8 | -static void init(); |
| 9 | +static void init(GData *the_symbols); |
| 10 | static void uninit (); |
| 11 | static LWPixmapSet *getPixmapSet (); |
| 12 | static xmlNode *getWizardXML (); |
| 13 | diff -r -u littlewizard-1.1.5/liblw/environment.cc littlewizard-1.1.5.new/liblw/environment.cc |
| 14 | --- littlewizard-1.1.5/liblw/environment.cc 2005-11-16 22:25:02.000000000 +0100 |
| 15 | +++ littlewizard-1.1.5.new/liblw/environment.cc 2007-09-25 07:19:13.059840366 +0200 |
| 16 | @@ -33,8 +33,6 @@ |
| 17 | LWProgram *LWEnvironment::program=NULL; |
| 18 | gboolean LWEnvironment::enabled_grid=FALSE; |
| 19 | |
| 20 | -extern GData *get_symbols (); |
| 21 | - |
| 22 | /*! \brief Tworzy obszar z suwakiem |
| 23 | |
| 24 | Tworzy obszar z suwakiem, modyfikując dodatkowo kolor tła obszaru. |
| 25 | @@ -63,12 +61,13 @@ |
| 26 | |
| 27 | Inicjuje środowisko, odczytując ustawienia z pliku |
| 28 | */ |
| 29 | -void LWEnvironment::init () |
| 30 | +void LWEnvironment::init (GData *the_symbols) |
| 31 | { |
| 32 | static gboolean inited=FALSE; |
| 33 | xmlDoc *doc=NULL; |
| 34 | |
| 35 | g_assert (inited == FALSE); |
| 36 | + g_assert (the_symbols != NULL); |
| 37 | inited = TRUE; |
| 38 | |
| 39 | xmlNode *root_node = initializeXMLTree (doc); |
| 40 | @@ -91,7 +90,7 @@ |
| 41 | icons->restoreFromXML (root_node->children->next->next); |
| 42 | gtk_paned_add1 (GTK_PANED (world_paned), icons->getWidget()); |
| 43 | |
| 44 | - symbols = get_symbols(); |
| 45 | + symbols = the_symbols; |
| 46 | program_paned = gtk_vpaned_new (); |
| 47 | g_object_ref (G_OBJECT (program_paned)); |
| 48 | gtk_widget_show (program_paned); |
| 49 | diff -r -u littlewizard-1.1.5/src/lwtest.cc littlewizard-1.1.5.new/src/lwtest.cc |
| 50 | --- littlewizard-1.1.5/src/lwtest.cc 2006-01-17 20:03:24.000000000 +0100 |
| 51 | +++ littlewizard-1.1.5.new/src/lwtest.cc 2007-09-25 07:19:49.570664393 +0200 |
| 52 | @@ -15,6 +15,8 @@ |
| 53 | #include "include/support.h" |
| 54 | #include "include/environment.h" |
| 55 | |
| 56 | +extern GData *get_symbols(); |
| 57 | + |
| 58 | static void test_save (xmlDoc *doc, char *filename) |
| 59 | { |
| 60 | xmlSaveFile (filename, doc); |
| 61 | @@ -42,7 +44,8 @@ |
| 62 | { |
| 63 | gtk_init (&argc, &argv); |
| 64 | |
| 65 | - LWEnvironment::init(); |
| 66 | + GData *symbols = get_symbols(); |
| 67 | + LWEnvironment::init(symbols); |
| 68 | LWProject *project = new LWProject(); |
| 69 | LWEnvironment::setProject (project); |
| 70 | |
| 71 | diff -r -u littlewizard-1.1.5/src/main.cc littlewizard-1.1.5.new/src/main.cc |
| 72 | --- littlewizard-1.1.5/src/main.cc 2007-07-09 22:24:33.000000000 +0200 |
| 73 | +++ littlewizard-1.1.5.new/src/main.cc 2007-09-25 07:50:50.432771577 +0200 |
| 74 | @@ -23,7 +23,7 @@ |
| 75 | |
| 76 | extern void create_interface (); |
| 77 | extern void set_title (gchar *name); |
| 78 | - |
| 79 | +extern GData *get_symbols (); |
| 80 | |
| 81 | int |
| 82 | main (int argc, char *argv[]) |
| 83 | @@ -80,7 +80,8 @@ |
| 84 | g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); |
| 85 | g_list_free (icon_list); |
| 86 | |
| 87 | - LWEnvironment::init(); |
| 88 | + GData *symbols = get_symbols(); |
| 89 | + LWEnvironment::init(symbols); |
| 90 | LWProject *project = new LWProject(); |
| 91 | LWEnvironment::setProject (project); |
| 92 | |
projects / packages / littlewizard.git / blame