Commit 58a21bd1 authored by Miguel de Icaza's avatar Miguel de Icaza Committed by Arturo Espinosa

Generate gnumeric.desktop

1999-10-06  Miguel de Icaza  <miguel@gnu.org>

	* configure.in: Generate gnumeric.desktop

	* gnumeric.desktop.in: New file, used to choose the correct
	gnumeric/gnumeric-bonobo executable name.

	* src/sheet-object-item.c: Updated to fit with the new Bonobo
	changes.
parent 2792bc1d
1999-10-06 Miguel de Icaza <miguel@gnu.org>
* configure.in: Generate gnumeric.desktop
* gnumeric.desktop.in: New file, used to choose the correct
gnumeric/gnumeric-bonobo executable name.
* src/sheet-object-item.c: Updated to fit with the new Bonobo
changes.
1999-10-06 Jody Goldberg <jgoldberg@home.com> 1999-10-06 Jody Goldberg <jgoldberg@home.com>
* src/dialogs/dialog-zoom.c (dialog_zoom_impl) : Have the custom zoom * src/dialogs/dialog-zoom.c (dialog_zoom_impl) : Have the custom zoom
......
...@@ -4,7 +4,7 @@ change_logs = \ ...@@ -4,7 +4,7 @@ change_logs = \
OChangeLog OChangeLog
EXTRA_DIST = \ EXTRA_DIST = \
gnumeric.desktop README HACKING gnumeric.spec.in \ gnumeric.desktop.in README HACKING gnumeric.spec.in \
gnumeric.keys.in gnumeric.mime $(appicon_DATA) \ gnumeric.keys.in gnumeric.mime $(appicon_DATA) \
gnumeric.gnorba $(change_logs) gnumeric.gnorba $(change_logs)
......
1999-10-06 Miguel de Icaza <miguel@gnu.org>
* configure.in: Generate gnumeric.desktop
* gnumeric.desktop.in: New file, used to choose the correct
gnumeric/gnumeric-bonobo executable name.
* src/sheet-object-item.c: Updated to fit with the new Bonobo
changes.
1999-10-06 Jody Goldberg <jgoldberg@home.com> 1999-10-06 Jody Goldberg <jgoldberg@home.com>
* src/dialogs/dialog-zoom.c (dialog_zoom_impl) : Have the custom zoom * src/dialogs/dialog-zoom.c (dialog_zoom_impl) : Have the custom zoom
......
...@@ -133,6 +133,8 @@ AC_ARG_WITH(bonobo, ...@@ -133,6 +133,8 @@ AC_ARG_WITH(bonobo,
fi fi
) )
gnumeric_executable=gnumeric
AC_SUBST(gnumeric_executable)
if $try_bonobo; then if $try_bonobo; then
AC_MSG_CHECKING(for Bonobo > 0.2) AC_MSG_CHECKING(for Bonobo > 0.2)
if gnome-config --libs bonobo > /dev/null 2>&1; then if gnome-config --libs bonobo > /dev/null 2>&1; then
...@@ -152,6 +154,7 @@ if $try_bonobo; then ...@@ -152,6 +154,7 @@ if $try_bonobo; then
have_bonobo=true have_bonobo=true
bonobo=bonobo bonobo=bonobo
bonobo_msg=yes bonobo_msg=yes
gnumeric_executable=gnumeric-bonobo
else else
AC_MSG_RESULT(not found) AC_MSG_RESULT(not found)
fi fi
...@@ -225,6 +228,7 @@ plugins/html/Makefile ...@@ -225,6 +228,7 @@ plugins/html/Makefile
intl/Makefile intl/Makefile
po/Makefile.in po/Makefile.in
macros/Makefile macros/Makefile
gnumeric.desktop
stamp.h stamp.h
],[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]) ],[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
......
...@@ -21,7 +21,7 @@ Comment[ko]= ...@@ -21,7 +21,7 @@ Comment[ko]=
Comment[no]=Regnearkprogram Comment[no]=Regnearkprogram
Comment[pt]=Folha de clculo Gnumeric Comment[pt]=Folha de clculo Gnumeric
Comment[pl]=Arkusz kalkulacyjny Comment[pl]=Arkusz kalkulacyjny
Exec=gnumeric Exec=@gnumeric_executable@
Icon=gnome-gnumeric.png Icon=gnome-gnumeric.png
Terminal=0 Terminal=0
Type=Application Type=Application
[Desktop Entry]
Name=Gnumeric spreadsheet
Name[da]=Gnumeric
Name[de]=Gnumeric Tabellenkalkulation
Name[es]=Gnumeric
Name[et]=Gnumeric
Name[fr]=Tableur Gnumeric
Name[ja]=Gnumericץåɥ
Name[ko]=Gnumeric 彬Ʈ
Name[no]=Gnumeric regneark
Name[pt]=Gnumeric
Name[pl]=Arkusz kalkulacyjny Gnumeric
Comment=Spreadsheet
Comment[da]=Regneark
Comment[de]=Gnumeric Tabellenkalkulation
Comment[es]=Hoja de clculo
Comment[et]=Tabelarvutus
Comment[fr]=Tableur Gnumeric
Comment[ja]=ɽ׻ץ
Comment[ko]=彬Ʈ
Comment[no]=Regnearkprogram
Comment[pt]=Folha de clculo Gnumeric
Comment[pl]=Arkusz kalkulacyjny
Exec=@gnumeric_executable@
Icon=gnome-gnumeric.png
Terminal=0
Type=Application
...@@ -15,30 +15,17 @@ ...@@ -15,30 +15,17 @@
static SheetObject *sheet_object_item_parent_class; static SheetObject *sheet_object_item_parent_class;
static void
item_destroyed (GnomeCanvasItem *item, GnomeViewFrame *view_frame)
{
gnome_object_destroy (GNOME_OBJECT (view_frame));
}
static GnomeCanvasItem * static GnomeCanvasItem *
sheet_object_item_realize (SheetObject *so, SheetView *sheet_view) sheet_object_item_realize (SheetObject *so, SheetView *sheet_view)
{ {
GnomeCanvasItem *item = NULL; GnomeCanvasItem *item = NULL;
GnomeViewFrame *view_frame;
/* /*
* Create item/view-frame * Create item/view-frame
*/ */
view_frame = gnome_client_site_new_item ( item = gnome_client_site_new_item (
SHEET_OBJECT_BONOBO (so)->client_site, SHEET_OBJECT_BONOBO (so)->client_site,
sheet_view->object_group, &item); sheet_view->object_group);
gnome_view_frame_set_ui_handler (view_frame, so->sheet->workbook->uih);
gtk_signal_connect (
GTK_OBJECT (item), "destroy",
GTK_SIGNAL_FUNC (item_destroyed), view_frame);
return item; return item;
} }
...@@ -46,7 +33,6 @@ sheet_object_item_realize (SheetObject *so, SheetView *sheet_view) ...@@ -46,7 +33,6 @@ sheet_object_item_realize (SheetObject *so, SheetView *sheet_view)
static void static void
sheet_object_item_update_bounds (SheetObject *sheet_object) sheet_object_item_update_bounds (SheetObject *sheet_object)
{ {
/* Does not do much */
} }
static void static void
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment