Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_border.h e_config_dialog.c e_configure.c
e_dialog.c e_dialog.h e_int_border_menu.c
e_int_config_background.c e_int_config_cfgdialogs.c
e_int_config_cursor.c e_int_config_desklock.c
e_int_config_desks.c e_int_config_display.c
e_int_config_exebuf.c e_int_config_focus.c
e_int_config_fonts.c e_int_config_keybindings.c
e_int_config_menus.c e_int_config_modules.c
e_int_config_paths.c e_int_config_performance.c
e_int_config_shelf.c e_int_config_startup.c
e_int_config_theme.c e_int_config_window_display.c
e_int_config_window_manipulation.c e_int_config_winlist.c
e_int_gadcon_config.c e_menu.h e_theme_about.c
Log Message:
Give ability for config dialogs to set their border icon to the proper
config icon, rather than all having the E logo. Is proactive about setting
this: if it does not find or cannot set to that icon, it will fallback to
the E icon.
Change all config dialogs to support this.
If we have an internal border (config dialogs), disable the Create Icon/Edit
Icon menu items.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -3 -r1.507 -r1.508
--- e_border.c 19 Jun 2006 19:29:31 -0000 1.507
+++ e_border.c 2 Jul 2006 16:19:51 -0000 1.508
@@ -2448,7 +2448,11 @@
if (bd->internal)
{
o = edje_object_add(evas);
- e_util_edje_icon_set(o, "enlightenment/e");
+ if (!bd->internal_icon)
+ e_util_edje_icon_set(o, "enlightenment/e");
+ else
+ if (!e_util_edje_icon_set(o, bd->internal_icon))
+ e_util_edje_icon_set(o, "enlightenment/e");
return o;
}
if (e_config->use_app_icon)
@@ -3026,6 +3030,7 @@
if (bd->client.netwm.name) free(bd->client.netwm.name);
if (bd->client.netwm.icon_name) free(bd->client.netwm.icon_name);
e_object_del(E_OBJECT(bd->shape));
+ if (bd->internal_icon) evas_stringshare_del(bd->internal_icon);
if (bd->icon_object) evas_object_del(bd->icon_object);
evas_object_del(bd->bg_object);
e_canvas_del(bd->bg_ecore_evas);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -3 -r1.141 -r1.142
--- e_border.h 19 Jun 2006 17:13:56 -0000 1.141
+++ e_border.h 2 Jul 2006 16:19:51 -0000 1.142
@@ -134,6 +134,7 @@
Evas_Object *bg_object;
Evas_Object *icon_object;
Ecore_X_Window event_win;
+ const char *internal_icon;
struct {
Ecore_X_Window shell_win;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config_dialog.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_config_dialog.c 31 May 2006 18:58:26 -0000 1.25
+++ e_config_dialog.c 2 Jul 2006 16:19:51 -0000 1.26
@@ -107,8 +107,6 @@
cfd->dia->data = cfd;
e_object_del_attach_func_set(E_OBJECT(cfd->dia),
_e_config_dialog_cb_dialog_del);
e_dialog_title_set(cfd->dia, cfd->title);
- if (cfd->icon) e_dialog_icon_set(cfd->dia, cfd->icon, cfd->icon_size);
-
if (!cfd->cfdata) cfd->cfdata = cfd->view->create_cfdata(cfd);
if (type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC)
@@ -162,12 +160,14 @@
{
e_win_centered_set(cfd->dia->win, 1);
e_dialog_show(cfd->dia);
+ if (cfd->icon) e_dialog_border_icon_set(cfd->dia, cfd->icon);
}
else
{
int x, y;
e_dialog_show(cfd->dia);
+ if (cfd->icon) e_dialog_border_icon_set(cfd->dia, cfd->icon);
x = pdia->win->border->x + ((pdia->win->w - cfd->dia->win->w) / 2);
y = pdia->win->border->y + ((pdia->win->h - cfd->dia->win->h) / 2);
if (x < 0) x = 0;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- e_configure.c 2 Jul 2006 12:51:57 -0000 1.46
+++ e_configure.c 2 Jul 2006 16:19:51 -0000 1.47
@@ -113,8 +113,9 @@
evas_object_show(eco->ilist);
evas_object_show(eco->close);
evas_object_show(eco->edje);
-
+
e_win_show(eco->win);
+ eco->win->border->internal_icon =
evas_stringshare_add("enlightenment/configuration");
e_widget_focus_set(eco->ilist, 1);
e_widget_ilist_go(eco->ilist);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_dialog.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- e_dialog.c 2 Mar 2006 12:03:48 -0000 1.34
+++ e_dialog.c 2 Jul 2006 16:19:51 -0000 1.35
@@ -151,6 +151,18 @@
evas_object_show(dia->icon_object);
}
+EAPI void
+e_dialog_border_icon_set(E_Dialog *dia, const char *icon)
+{
+ E_Border *border;
+
+ if (!icon) return;
+
+ border = dia->win->border;
+ if (!border) return;
+ border->internal_icon = evas_stringshare_add(icon);
+}
+
EAPI void
e_dialog_content_set(E_Dialog *dia, Evas_Object *obj, Evas_Coord minw,
Evas_Coord minh)
{
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_dialog.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_dialog.h 2 Mar 2006 12:03:48 -0000 1.12
+++ e_dialog.h 2 Jul 2006 16:19:51 -0000 1.13
@@ -37,6 +37,7 @@
EAPI void e_dialog_title_set (E_Dialog *dia, const char
*title);
EAPI void e_dialog_text_set (E_Dialog *dia, const char
*text);
EAPI void e_dialog_icon_set (E_Dialog *dia, const char
*icon, Evas_Coord size);
+EAPI void e_dialog_border_icon_set (E_Dialog *dia, const char
*icon);
EAPI void e_dialog_content_set (E_Dialog *dia, Evas_Object
*obj, Evas_Coord minw, Evas_Coord minh);
EAPI void e_dialog_resizable_set (E_Dialog *dia, int resizable);
EAPI void e_dialog_show (E_Dialog *dia);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- e_int_border_menu.c 2 Jul 2006 06:57:38 -0000 1.27
+++ e_int_border_menu.c 2 Jul 2006 16:19:51 -0000 1.28
@@ -249,23 +249,26 @@
"widgets/border/default/skip_winlist");
}
- mi = e_menu_item_new(m);
- e_menu_item_separator_set(mi, 1);
-
- if (bd->app)
+ if (!bd->internal)
{
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, _("Edit Icon"));
- e_menu_item_callback_set(mi, _e_border_menu_cb_icon_edit, bd);
- e_menu_item_icon_edje_set(mi, bd->app->path, "icon");
+ e_menu_item_separator_set(mi, 1);
+
+ if (bd->app)
+ {
+ mi = e_menu_item_new(m);
+ e_menu_item_label_set(mi, _("Edit Icon"));
+ e_menu_item_callback_set(mi, _e_border_menu_cb_icon_edit, bd);
+ e_menu_item_icon_edje_set(mi, bd->app->path, "icon");
+ }
+ else if (bd->client.icccm.class) /* icons with no class useless to
borders */
+ {
+ mi = e_menu_item_new(m);
+ e_menu_item_label_set(mi, _("Create Icon"));
+ e_menu_item_callback_set(mi, _e_border_menu_cb_icon_edit, bd);
+ }
}
- else if (bd->client.icccm.class) /* icons with no class useless to borders
*/
- {
- mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, _("Create Icon"));
- e_menu_item_callback_set(mi, _e_border_menu_cb_icon_edit, bd);
- }
-
+
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_background.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- e_int_config_background.c 2 Jul 2006 12:51:57 -0000 1.54
+++ e_int_config_background.c 2 Jul 2006 16:19:51 -0000 1.55
@@ -52,7 +52,7 @@
v->advanced.create_widgets = _advanced_create_widgets;
v->close_cfdata = _bg_dialog_close;
v->override_auto_apply = 1;
- cfd = e_config_dialog_new(con, _("Wallpaper Settings"), NULL, 0, v, NULL);
+ cfd = e_config_dialog_new(con, _("Wallpaper Settings"),
"enlightenment/background", 0, v, NULL);
return cfd;
}
@@ -102,7 +102,7 @@
cfdata->il = il;
e_widget_ilist_selector_set(il, 1);
- e_widget_min_size_set(il, 180, 40);
+ e_widget_min_size_set(il, 160, 40);
/* Load Bgs */
_load_bgs(cfd, il);
@@ -164,7 +164,7 @@
il = e_widget_ilist_add(evas, 48, 48, &(cfdata->bg));
cfdata->il = il;
e_widget_ilist_selector_set(il, 1);
- e_widget_min_size_set(il, 180, 40);
+ e_widget_min_size_set(il, 160, 40);
/* Load Bgs */
_load_bgs(cfd, il);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_cfgdialogs.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_int_config_cfgdialogs.c 9 Jun 2006 08:09:56 -0000 1.5
+++ e_int_config_cfgdialogs.c 2 Jul 2006 16:19:51 -0000 1.6
@@ -31,7 +31,7 @@
v->advanced.create_widgets = NULL;
v->override_auto_apply = 1;
- cfd = e_config_dialog_new(con, _("Config Dialog Settings"), NULL, 0, v,
NULL);
+ cfd = e_config_dialog_new(con, _("Config Dialog Settings"),
"enlightenment/configuration", 0, v, NULL);
return cfd;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_cursor.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_int_config_cursor.c 30 Apr 2006 03:43:47 -0000 1.7
+++ e_int_config_cursor.c 2 Jul 2006 16:19:51 -0000 1.8
@@ -30,7 +30,7 @@
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
- cfd = e_config_dialog_new(con, _("Cursor Settings"), NULL, 0, v, NULL);
+ cfd = e_config_dialog_new(con, _("Cursor Settings"), "enlightenment/mouse",
0, v, NULL);
return cfd;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_desklock.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_int_config_desklock.c 13 Jun 2006 09:05:36 -0000 1.22
+++ e_int_config_desklock.c 2 Jul 2006 16:19:51 -0000 1.23
@@ -99,7 +99,7 @@
v->override_auto_apply = 1;
- cfd = e_config_dialog_new(con, _("Desktop Lock Settings"), NULL, 0, v, NULL);
+ cfd = e_config_dialog_new(con, _("Desktop Lock Settings"),
"enlightenment/desklock", 0, v, NULL);
return cfd;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_desks.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_int_config_desks.c 7 Jun 2006 23:30:12 -0000 1.15
+++ e_int_config_desks.c 2 Jul 2006 16:19:51 -0000 1.16
@@ -41,7 +41,7 @@
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
/* create config diaolg for NULL object/data */
- cfd = e_config_dialog_new(con, _("Desktop Settings"), NULL, 0, v, NULL);
+ cfd = e_config_dialog_new(con, _("Desktop Settings"),
"enlightenment/desktops", 0, v, NULL);
return cfd;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_display.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_int_config_display.c 31 May 2006 18:58:26 -0000 1.14
+++ e_int_config_display.c 2 Jul 2006 16:19:51 -0000 1.15
@@ -190,7 +190,7 @@
v->basic.create_widgets = _basic_create_widgets;
v->override_auto_apply = 1;
- cfd = e_config_dialog_new(con, _("Display Settings"), NULL, 0, v, NULL);
+ cfd = e_config_dialog_new(con, _("Display Settings"),
"enlightenment/screen_resolution", 0, v, NULL);
return cfd;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_exebuf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_int_config_exebuf.c 30 Apr 2006 03:43:47 -0000 1.2
+++ e_int_config_exebuf.c 2 Jul 2006 16:19:51 -0000 1.3
@@ -39,7 +39,7 @@
v->basic.create_widgets = _basic_create_widgets;
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
- cfd = e_config_dialog_new(con, _("Exebuf Settings"), NULL, 0, v, NULL);
+ cfd = e_config_dialog_new(con, _("Exebuf Settings"), "enlightenment/run",
0, v, NULL);
return cfd;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_focus.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_int_config_focus.c 5 May 2006 12:20:14 -0000 1.12
+++ e_int_config_focus.c 2 Jul 2006 16:19:51 -0000 1.13
@@ -44,7 +44,7 @@
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
/* create config diaolg for NULL object/data */
- cfd = e_config_dialog_new(con, _("Focus Settings"), NULL, 0, v, NULL);
+ cfd = e_config_dialog_new(con, _("Focus Settings"), "enlightenment/focus",
0, v, NULL);
return cfd;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_fonts.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_int_config_fonts.c 1 Jun 2006 05:27:25 -0000 1.15
+++ e_int_config_fonts.c 2 Jul 2006 16:19:51 -0000 1.16
@@ -129,7 +129,7 @@
v->basic.create_widgets = _basic_create_widgets;
v->basic.apply_cfdata = _basic_apply_data;
- cfd = e_config_dialog_new(con, _("Font Settings"), NULL, 0, v, NULL);
+ cfd = e_config_dialog_new(con, _("Font Settings"), "enlightenment/fonts",
0, v, NULL);
return cfd;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_keybindings.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- e_int_config_keybindings.c 2 Jul 2006 11:05:59 -0000 1.30
+++ e_int_config_keybindings.c 2 Jul 2006 16:19:51 -0000 1.31
@@ -312,7 +312,7 @@
v->basic.create_widgets = _basic_create_widgets;
v->override_auto_apply = 1;
- cfd = e_config_dialog_new(con, _("Key Binding Settings"), NULL, 0, v, NULL);
+ cfd = e_config_dialog_new(con, _("Key Binding Settings"),
"enlightenment/keys", 0, v, NULL);
return cfd;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_menus.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_int_config_menus.c 30 Apr 2006 03:43:47 -0000 1.6
+++ e_int_config_menus.c 2 Jul 2006 16:19:51 -0000 1.7
@@ -36,7 +36,7 @@
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
- cfd = e_config_dialog_new(con, _("Menu Settings"), NULL, 0, v, NULL);
+ cfd = e_config_dialog_new(con, _("Menu Settings"), "enlightenment/menus",
0, v, NULL);
return cfd;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_modules.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- e_int_config_modules.c 22 Jun 2006 20:20:16 -0000 1.37
+++ e_int_config_modules.c 2 Jul 2006 16:19:51 -0000 1.38
@@ -50,7 +50,7 @@
v->basic.create_widgets = _basic_create_widgets;
v->basic.apply_cfdata = _basic_apply_data;
- cfd = e_config_dialog_new(con, _("Module Settings"), NULL, 0, v, NULL);
+ cfd = e_config_dialog_new(con, _("Module Settings"),
"enlightenment/modules", 0, v, NULL);
return cfd;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_paths.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_int_config_paths.c 31 May 2006 22:51:24 -0000 1.2
+++ e_int_config_paths.c 2 Jul 2006 16:19:51 -0000 1.3
@@ -58,7 +58,7 @@
v->basic.create_widgets = _basic_create_widgets;
v->basic.apply_cfdata = _basic_apply_data;
- cfd = e_config_dialog_new(con, _("Search Path Configuration"), NULL, 0, v,
NULL);
+ cfd = e_config_dialog_new(con, _("Search Path Configuration"),
"enlightenment/directories", 0, v, NULL);
return cfd;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_performance.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_int_config_performance.c 30 Apr 2006 03:43:47 -0000 1.7
+++ e_int_config_performance.c 2 Jul 2006 16:19:51 -0000 1.8
@@ -34,7 +34,7 @@
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
- cfd = e_config_dialog_new(con, _("Performance Settings"), NULL, 0, v, NULL);
+ cfd = e_config_dialog_new(con, _("Performance Settings"),
"enlightenment/performance", 0, v, NULL);
return cfd;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_shelf.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_int_config_shelf.c 17 Jun 2006 03:10:54 -0000 1.11
+++ e_int_config_shelf.c 2 Jul 2006 16:19:51 -0000 1.12
@@ -23,7 +23,7 @@
v->free_cfdata = _free_data;
v->basic.create_widgets = _basic_create_widgets;
- cfd = e_config_dialog_new(con, _("Shelf Settings"), NULL, 0, v, NULL);
+ cfd = e_config_dialog_new(con, _("Shelf Settings"), "enlightenment/shelf",
0, v, NULL);
return cfd;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_startup.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_int_config_startup.c 7 Jun 2006 21:42:13 -0000 1.8
+++ e_int_config_startup.c 2 Jul 2006 16:19:51 -0000 1.9
@@ -32,7 +32,7 @@
v->basic.apply_cfdata = _basic_apply_data;
v->basic.create_widgets = _basic_create_widgets;
- cfd = e_config_dialog_new(con, _("Startup Settings"), NULL, 0, v, NULL);
+ cfd = e_config_dialog_new(con, _("Startup Settings"),
"enlightenment/startup", 0, v, NULL);
return cfd;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_int_config_theme.c 31 May 2006 18:58:26 -0000 1.26
+++ e_int_config_theme.c 2 Jul 2006 16:19:51 -0000 1.27
@@ -44,7 +44,7 @@
v->override_auto_apply = 1;
/* create config diaolg for NULL object/data */
- cfd = e_config_dialog_new(con, _("Theme Selector"), NULL, 0, v, NULL);
+ cfd = e_config_dialog_new(con, _("Theme Selector"), "enlightenment/themes",
0, v, NULL);
return cfd;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_window_display.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_int_config_window_display.c 25 May 2006 16:14:10 -0000 1.14
+++ e_int_config_window_display.c 2 Jul 2006 16:19:51 -0000 1.15
@@ -47,7 +47,7 @@
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
/* create config diaolg for NULL object/data */
- cfd = e_config_dialog_new(con, _("Window Display"), NULL, 0, v, NULL);
+ cfd = e_config_dialog_new(con, _("Window Display"),
"enlightenment/windows", 0, v, NULL);
return cfd;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_window_manipulation.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_int_config_window_manipulation.c 10 Jun 2006 19:40:15 -0000 1.12
+++ e_int_config_window_manipulation.c 2 Jul 2006 16:19:51 -0000 1.13
@@ -46,7 +46,7 @@
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
/* create config diaolg for NULL object/data */
- cfd = e_config_dialog_new(con, _("Window Manipulation"), NULL, 0, v, NULL);
+ cfd = e_config_dialog_new(con, _("Window Manipulation"),
"enlightenment/window_manipulation", 0, v, NULL);
return cfd;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_winlist.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_int_config_winlist.c 30 Apr 2006 03:43:47 -0000 1.8
+++ e_int_config_winlist.c 2 Jul 2006 16:19:51 -0000 1.9
@@ -48,7 +48,7 @@
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
- cfd = e_config_dialog_new(con, _("Window List Settings"), NULL, 0, v, NULL);
+ cfd = e_config_dialog_new(con, _("Window List Settings"),
"enlightenment/winlist", 0, v, NULL);
return cfd;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_gadcon_config.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_int_gadcon_config.c 28 Jun 2006 07:20:16 -0000 1.22
+++ e_int_gadcon_config.c 2 Jul 2006 16:19:51 -0000 1.23
@@ -176,6 +176,8 @@
l = evas_list_nth_list(cfdata->cf_gc->clients, i);
cf_gcc = l->data;
+ printf("Remove Client Name: %s\n", cf_gcc->name);
+
if (cf_gcc->name) evas_stringshare_del(cf_gcc->name);
if (cf_gcc->id) evas_stringshare_del(cf_gcc->id);
if (cf_gcc->style) evas_stringshare_del(cf_gcc->style);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_menu.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_menu.h 2 Mar 2006 12:03:48 -0000 1.17
+++ e_menu.h 2 Jul 2006 16:19:51 -0000 1.18
@@ -98,7 +98,7 @@
Evas_Object *icon_object;
Evas_Object *label_object;
Evas_Object *submenu_object;
-
+
Evas_Object *event_object;
int label_w, label_h;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_theme_about.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_theme_about.c 7 Jan 2006 10:39:45 -0000 1.4
+++ e_theme_about.c 2 Jul 2006 16:19:51 -0000 1.5
@@ -72,6 +72,7 @@
e_win_size_max_set(about->win, mw, mh);
}
e_win_show(about->win);
+ about->win->border->internal_icon =
evas_stringshare_add("enlightenment/themes");
}
/* local subsystem functions */
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
