Enlightenment CVS committal
Author : andreas99
Project : e16
Module : tools
Dir : e16/tools/e16menuedit2/src
Modified Files:
callbacks.c e16menu.c e16menu.h e16menuedit2.c e16menuedit2.h
icon_chooser.c treeview.c
Log Message:
inserted new data structure for global variables
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/callbacks.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- callbacks.c 5 Dec 2004 11:12:51 -0000 1.22
+++ callbacks.c 29 Dec 2004 11:25:42 -0000 1.23
@@ -34,8 +34,7 @@
#include "e16menu.h"
#include "treeview.h"
-extern char *browser;
-extern char *glade_file;
+extern struct global_variables gv;
void bind_toolbar_callbacks (GtkWidget *treeview_menu)
{
@@ -161,7 +160,7 @@
GladeXML *info_xml;
char *pixmap_file;
- info_xml = glade_xml_new (glade_file,
+ info_xml = glade_xml_new (gv.glade_file,
"info_window", NULL);
register_libglade_parent (info_xml, "info_window");
@@ -300,8 +299,8 @@
if (help_error)
{
- g_print ("running browser: %s\n", browser);
- help_error = run_help (browser, YELP_HELP_DIR, PACKAGE".html");
+ g_print ("running browser: %s\n", gv.browser);
+ help_error = run_help (gv.browser, YELP_HELP_DIR, PACKAGE".html");
if (help_error == 1)
{
@@ -328,7 +327,7 @@
GtkTreeModel* treemodel;
char *pixmap_file;
- properties_xml = glade_xml_new (glade_file, "properties_window", NULL);
+ properties_xml = glade_xml_new (gv.glade_file, "properties_window", NULL);
register_libglade_parent (properties_xml, "properties_window");
glade_xml_signal_autoconnect (properties_xml);
@@ -394,9 +393,9 @@
0, &value,
-1);
- g_free (browser);
- browser = g_malloc (strlen (value)+1);
- strncpy (browser, value, strlen (value)+1);
+ g_free (gv.browser);
+ gv.browser = g_malloc (strlen (value)+1);
+ strncpy (gv.browser, value, strlen (value)+1);
fprintf (fz_properties, "%s = %s\n", "browser", value);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/e16menu.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e16menu.c 29 Dec 2004 11:09:22 -0000 1.7
+++ e16menu.c 29 Dec 2004 11:25:42 -0000 1.8
@@ -30,10 +30,7 @@
#include "e16menuedit2.h"
#include "treeview.h"
-int app_errno;
-char app_errno_str[APP_ERRNO_STR_LEN];
-extern char *epath;
-extern int emenu;
+extern struct global_variables gv;
GtkTreeModel *load_menus_from_disk (void)
{
@@ -51,22 +48,22 @@
G_TYPE_STRING,
G_TYPE_STRING);
- if (emenu == EMENU_AUTODETECT)
+ if (gv.emenu == EMENU_AUTODETECT)
{
struct stat stat_buf;
gboolean epath_missing = TRUE;
- sprintf (buf, "%s/file.menu", epath);
+ sprintf (buf, "%s/file.menu", gv.epath);
epath_missing = stat (buf, &stat_buf);
if (epath_missing)
{
- sprintf (buf, "%s/menus/file.menu", epath);
+ sprintf (buf, "%s/menus/file.menu", gv.epath);
}
}
- else if (emenu == EMENU_MENUS)
+ else if (gv.emenu == EMENU_MENUS)
{
- sprintf (buf, "%s/menus/file.menu", epath);
+ sprintf (buf, "%s/menus/file.menu", gv.epath);
}
else
{
@@ -184,7 +181,7 @@
if (!file_to_load)
return;
if (file_to_load[0] != '/')
- sprintf (buf, "%s/%s", epath, file_to_load);
+ sprintf (buf, "%s/%s", gv.epath, file_to_load);
else
sprintf (buf, "%s", file_to_load);
@@ -286,7 +283,7 @@
if (!g_path_is_absolute (params))
{
/* Tarnation! A relative path */
- realfile = g_strjoin (epath, params, NULL);
+ realfile = g_strjoin (gv.epath, params, NULL);
}
else
{
@@ -416,8 +413,8 @@
has_child = gtk_tree_model_iter_has_child (model, iter);
depth = gtk_tree_path_get_depth (path) - 1;
- app_errno = 0;
- strcpy (app_errno_str, "");
+ gv.app_errno = 0;
+ strcpy (gv.app_errno_str, "");
if (depth + 1 >= MAX_RECURSION)
{
@@ -432,8 +429,8 @@
/* some checks for submenus */
if (!strcmp (params, ""))
{
- app_errno = AE_EMPTY_SUBMENU;
- strncpy (app_errno_str, tree_path_str, APP_ERRNO_STR_LEN);
+ gv.app_errno = AE_EMPTY_SUBMENU;
+ strncpy (gv.app_errno_str, tree_path_str, APP_ERRNO_STR_LEN);
return TRUE;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/e16menu.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e16menu.h 7 Aug 2004 17:08:31 -0000 1.3
+++ e16menu.h 29 Dec 2004 11:25:42 -0000 1.4
@@ -33,14 +33,6 @@
#endif
#define MAX_RECURSION 128
-#define APP_ERRNO_STR_LEN 1024
-
-/* app_errno codes */
-enum
-{
- AE_NO_ERROR = 0,
- AE_EMPTY_SUBMENU
-};
GtkTreeModel *load_menus_from_disk (void);
void load_sub_menu_from_disk (char *file_to_load, GtkTreeStore *store,
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/e16menuedit2.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e16menuedit2.c 29 Dec 2004 11:09:22 -0000 1.19
+++ e16menuedit2.c 29 Dec 2004 11:25:42 -0000 1.20
@@ -34,11 +34,7 @@
#include "e16menu.h"
#include "treeview.h"
-int librsvg_cmp;
-char *browser;
-char *glade_file;
-char *epath;
-int emenu;
+struct global_variables gv;
int main (int argc, char *argv[])
{
@@ -75,8 +71,8 @@
menu_file[i] = NULL;
}
- glade_file = searchGladeFile ("e16menuedit2.glade");
- main_xml = glade_xml_new (glade_file, "main_window", NULL);
+ gv.glade_file = searchGladeFile ("e16menuedit2.glade");
+ main_xml = glade_xml_new (gv.glade_file, "main_window", NULL);
register_libglade_parent (main_xml, "main_window");
@@ -102,7 +98,7 @@
/* get librsvg version and check if good enough */
version = pkg_config_version (package);
- librsvg_cmp = version_cmp (version, librsvg_version);
+ gv.librsvg_cmp = version_cmp (version, librsvg_version);
g_free (version);
print_statusbar (_("Menu successfully loaded!"));
@@ -116,9 +112,9 @@
{
fscanf (fz_properties, "%s = %s", key, value);
- g_free (browser);
- browser = g_malloc (strlen (value)+1);
- strncpy (browser, value, strlen (value)+1);
+ g_free (gv.browser);
+ gv.browser = g_malloc (strlen (value)+1);
+ strncpy (gv.browser, value, strlen (value)+1);
fclose (fz_properties);
}
@@ -127,8 +123,8 @@
gtk_main ();
- free (epath);
- g_free (glade_file);
+ free (gv.epath);
+ g_free (gv.glade_file);
return 0;
}
@@ -179,9 +175,9 @@
gtk_combo_box_set_active (GTK_COMBO_BOX (comboboxentry1),
atoi (tree_path_str));
- g_free (browser);
- browser = g_malloc (strlen (value)+1);
- strncpy (browser, value, strlen (value)+1);
+ g_free (gv.browser);
+ gv.browser = g_malloc (strlen (value)+1);
+ strncpy (gv.browser, value, strlen (value)+1);
g_free(tree_path_str);
return TRUE;
@@ -196,12 +192,12 @@
{
poptContext context;
int option;
- epath = NULL;
+ gv.epath = NULL;
struct stat buf;
gboolean epath_missing = TRUE;
char *tmp;
- emenu = EMENU_AUTODETECT;
+ gv.emenu = EMENU_AUTODETECT;
struct poptOption options[] =
{
@@ -215,17 +211,17 @@
/* get E path */
tmp = getenv ("ECONFDIR");
- epath = g_strdup_printf (tmp);
+ gv.epath = g_strdup_printf (tmp);
- if (!epath)
+ if (!gv.epath)
{
- epath = g_strdup_printf ("%s/%s", homedir (getuid ()),
+ gv.epath = g_strdup_printf ("%s/%s", homedir (getuid ()),
ENLIGHTENMENT_PATH);
}
- epath_missing = stat (epath, &buf);
+ epath_missing = stat (gv.epath, &buf);
if (epath_missing)
{
- g_critical ("The direcory %s seems not to be a E16 conf path!\n", epath);
+ g_critical ("The direcory %s seems not to be a E16 conf path!\n",
gv.epath);
}
context = poptGetContext ("popt1", argc, (const char **) argv, options, 0);
@@ -236,7 +232,7 @@
switch (option)
{
case ARG_MENUS:
- emenu = EMENU_MENUS;
+ gv.emenu = EMENU_MENUS;
break;
case ARG_VERSION:
show_version ();
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/e16menuedit2.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e16menuedit2.h 29 Dec 2004 11:09:22 -0000 1.9
+++ e16menuedit2.h 29 Dec 2004 11:25:42 -0000 1.10
@@ -39,6 +39,7 @@
#define to_utf8(String) g_locale_to_utf8(String,-1,0,0,0)
#define from_utf8(String) g_locale_from_utf8(String,-1,0,0,0)
+#define APP_ERRNO_STR_LEN 1024
#define APP_HOME ".e16menuedit2"
#define ICON_DIR "icons"
#define DEBUG_OUTPUT printf ("(%s, %d): ", __FILE__, __LINE__);
@@ -51,6 +52,24 @@
void parse_options (int argc, char **argv);
void show_version ();
+struct global_variables
+{
+ int app_errno;
+ char app_errno_str[APP_ERRNO_STR_LEN];
+ int librsvg_cmp;
+ char *browser;
+ char *glade_file;
+ char *epath;
+ int emenu;
+};
+
+/* app_errno codes */
+enum
+{
+ AE_NO_ERROR = 0,
+ AE_EMPTY_SUBMENU
+};
+
enum
{
ARG_MENUS = 1,
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/icon_chooser.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- icon_chooser.c 29 Jul 2004 21:28:29 -0000 1.2
+++ icon_chooser.c 29 Dec 2004 11:25:42 -0000 1.3
@@ -33,7 +33,7 @@
#include "file.h"
#include "treeview.h"
-extern int librsvg_cmp;
+extern struct global_variables gv;
void open_icon_chooser (GtkWidget *treeview_menu)
{
@@ -144,7 +144,7 @@
*/
right = g_malloc (3);
strsplit (filename, &right, g_utf8_strlen (filename, -1) - 3);
- if ((strcmp (right, "svg")) || (librsvg_cmp >= 0))
+ if ((strcmp (right, "svg")) || (gv.librsvg_cmp >= 0))
{
gdk_pixbuf_get_file_info (filename,
&width,
@@ -304,7 +304,7 @@
right = g_malloc (3);
strsplit (filename, &right, g_utf8_strlen (filename, -1) - 3);
- if ((strcmp (right, "svg")) || (librsvg_cmp >= 0))
+ if ((strcmp (right, "svg")) || (gv.librsvg_cmp >= 0))
{
gdk_pixbuf_get_file_info (filename, &width, &height);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/treeview.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- treeview.c 8 Aug 2004 09:12:29 -0000 1.5
+++ treeview.c 29 Dec 2004 11:25:42 -0000 1.6
@@ -29,9 +29,9 @@
#include "e16menu.h"
#include "callbacks.h"
#include "nls.h"
+#include "e16menuedit2.h"
-extern int app_errno;
-extern char app_errno_str[APP_ERRNO_STR_LEN];
+extern struct global_variables gv;
static GtkTargetEntry row_targets[] =
{
@@ -194,7 +194,7 @@
model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview_menu));
gtk_tree_model_foreach (GTK_TREE_MODEL(model), table_check_func, NULL);
- if (app_errno == AE_NO_ERROR)
+ if (gv.app_errno == AE_NO_ERROR)
{
gtk_tree_model_foreach (GTK_TREE_MODEL(model), table_save_func, NULL);
print_statusbar (_("Menu saved!"));
@@ -208,10 +208,10 @@
}
else
{
- if (app_errno == AE_EMPTY_SUBMENU)
+ if (gv.app_errno == AE_EMPTY_SUBMENU)
{
gtk_tree_view_set_cursor (GTK_TREE_VIEW (treeview_menu),
- gtk_tree_path_new_from_string (app_errno_str),
+ gtk_tree_path_new_from_string
(gv.app_errno_str),
gtk_tree_view_get_column (
GTK_TREE_VIEW (treeview_menu),
COL_PARAMS),
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
