From 220363cc87888291f0500b3951d61414bb3b1206 Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Sun, 16 Jan 2005 15:15:11 +0000 Subject: [PATCH] pack up patch to spare some size Package-Manager: portage-2.0.51-r13 --- app-office/ooqstart-gnome/Manifest | 4 +- .../ooqstart-gnome/files/gnome2update.patch | 861 ------------------ .../files/gnome2update.patch.bz2 | Bin 0 -> 8004 bytes .../ooqstart-gnome-0.8.3.ebuild | 4 +- 4 files changed, 4 insertions(+), 865 deletions(-) delete mode 100644 app-office/ooqstart-gnome/files/gnome2update.patch create mode 100644 app-office/ooqstart-gnome/files/gnome2update.patch.bz2 diff --git a/app-office/ooqstart-gnome/Manifest b/app-office/ooqstart-gnome/Manifest index 3cb9e08dd702..21c01658e337 100644 --- a/app-office/ooqstart-gnome/Manifest +++ b/app-office/ooqstart-gnome/Manifest @@ -1,6 +1,6 @@ MD5 34d36a1f62d06ad8b85cd169750d3973 ChangeLog 423 MD5 6e27642eb774b668fe48a47e475f2495 metadata.xml 400 -MD5 9904d9708aab588e2a66aa1d28103847 ooqstart-gnome-0.8.3.ebuild 1118 -MD5 0cfd93a44ae5d8dac0041e60de7caec5 files/gnome2update.patch 30265 +MD5 0704374835b5691d34871388af117e7e ooqstart-gnome-0.8.3.ebuild 1122 MD5 b8e5e4d8a4016a754ab52481fc66a00d files/gnome-ooqstart.png 3962 MD5 d262aad066c0dd58486d7a8a095b598d files/digest-ooqstart-gnome-0.8.3 62 +MD5 6e3446ddec68a391cd1f63851e4942c6 files/gnome2update.patch.bz2 8004 diff --git a/app-office/ooqstart-gnome/files/gnome2update.patch b/app-office/ooqstart-gnome/files/gnome2update.patch deleted file mode 100644 index 0305208bf1ba..000000000000 --- a/app-office/ooqstart-gnome/files/gnome2update.patch +++ /dev/null @@ -1,861 +0,0 @@ ---- ooqstart-0.8.3.orig/Makefile -+++ ooqstart-0.8.3/Makefile -@@ -38,7 +38,7 @@ - $(CXX) -o $@ $^ - - $(GNOME_TARGET) : $(GNOME_OBJECTS) -- $(CXX) -o $@ $^ `gnome-config --libs applets gdk_pixbuf` -+ $(CXX) -o $@ $^ `pkg-config --libs libpanelapplet-2.0` - - $(KDE_TARGET) : $(KDE_OBJECTS) - $(CXX) -o $@ $^ -@@ -53,7 +53,7 @@ - $(CXX) $(CFLAGS) -O2 -o $@ -c $< - - gnome.o : gnome/gnome.cxx -- $(CXX) $(CFLAGS) `gnome-config --cflags gnomeui gnorba gdk_pixbuf` -O2 -o $@ -c $< -+ $(CXX) $(CFLAGS) `pkg-config --cflags libpanelapplet-2.0` -O2 -o $@ -c $< - - %.o : %.cxx - $(CXX) $(CFLAGS) -O2 -o $@ -c $< -@@ -64,20 +64,14 @@ - ##################################################################### - ROOT= - PREFIX=$(ROOT)/usr --BIN=$(PREFIX)/bin - SHARE=$(PREFIX)/share --ETC=$(ROOT)/etc -+LIB=$(PREFIX)/lib -+LIBEXEC=$(PREFIX)/libexec - - install-gnome: -- install -D -s -m 755 $(GNOME_TARGET) $(BIN)/$(GNOME_TARGET) -- install -D -m 644 gnome/ooqstart_applet.desktop \ -- $(SHARE)/applets/Utility/ooqstart_applet.desktop -- install -D -m 644 ooqstart.png \ -- $(SHARE)/pixmaps/gnome-ooqstart.png -- install -D -m 644 gnome/ooqstart_applet.gnorba \ -- $(ETC)/CORBA/servers/ooqstart_applet.gnorba -- mkdir -p $(SHARE)/gnome/help/ooqstart_applet/C -- install -D -m 644 help/* $(SHARE)/gnome/help/ooqstart_applet/C -+ install -D -s -m 0755 $(GNOME_TARGET) $(LIBEXEC)/ooqstart_applet2 -+ install -D -m 0644 gnome/GNOME_OOQStartApplet.server \ -+ $(LIB)/bonobo/servers/GNOME_OOQStartApplet.server - - - ##################################################################### ---- ooqstart-0.8.3.orig/console/console.cxx -+++ ooqstart-0.8.3/console/console.cxx -@@ -26,12 +26,12 @@ - ========================================================================*/ - int main (int argc, char **argv) { - if (argc != 2) { -- printf("usage: ooqstart OPENOFFICE_BASE_DIR\n"); -+ printf ("usage: ooqstart OPENOFFICE_PROGRAM_PATH\n"); - return 1; - } - - Model model; -- model.setOpenOfficeDir(argv[1]); -+ model.setOpenOfficeProgram (argv[1]); - if (!model.isValid()) { - printf("error: Open Office executable not found in %s\n", argv[1]); - return 1; ---- ooqstart-0.8.3.orig/gnome/gnome.cxx -+++ ooqstart-0.8.3/gnome/gnome.cxx -@@ -15,7 +15,8 @@ - | INCLUDES - ========================================================================*/ - extern "C" { --#include -+#include -+#include - #include - #include - } -@@ -25,12 +26,18 @@ - #include "ooqstart-wait.xpm" - #include "ooqstart-off.xpm" - -- - /*========================================================================= - | CONSTANTS - ========================================================================*/ --#define PACKAGE "gnome-applets" -+#define PACKAGE "ooqstart" -+#define GETTEXT_PACKAGE "ooqstart" -+ -+#define OOFFICE_DEFAULT_PATH "/usr/bin/ooffice" - -+#define GC_PROG_PATH "/ooqstart-applet/paths/program" -+#define GC_APPLET_ENABLE "/ooqstart-applet/prefs/enable" -+ -+#define oq_debug(format, args...) - - /*========================================================================= - | STATIC GLOBALS -@@ -38,7 +38,6 @@ - static GtkWidget *propwindow; - static GtkWidget *applet; - static GtkWidget *entry; --static GtkWidget *checkbox; - - static GtkWidget *tile; - static GtkWidget *tilepixmap; -@@ -51,21 +58,30 @@ - enum IconState { ICON_NONE, ICON_OFF, ICON_WAIT, ICON_ON }; - static IconState iconState = ICON_NONE; - -+static Model model; - - /*========================================================================= - | LAUNCHERS - ========================================================================*/ --static void startWriter (AppletWidget *, gpointer pModel) { -- ((Model *)pModel)->startWriter(); --} --static void startCalc (AppletWidget *, gpointer pModel) { -- ((Model *)pModel)->startCalc(); --} --static void startDraw (AppletWidget *, gpointer pModel) { -- ((Model *)pModel)->startDraw(); --} --static void startImpress (AppletWidget *, gpointer pModel) { -- ((Model *)pModel)->startImpress(); -+static void startWriter (PanelApplet*) { -+ oq_debug ("Starting oowriter\n"); -+ //((Model *)pModel)->startWriter(); -+ model.startWriter(); -+} -+static void startCalc (PanelApplet*) { -+ oq_debug ("Starting oocalc\n"); -+ //((Model *)pModel)->startCalc(); -+ model.startCalc(); -+} -+static void startDraw (PanelApplet*) { -+ oq_debug ("Starting oodraw\n"); -+ //((Model *)pModel)->startDraw(); -+ model.startDraw(); -+} -+static void startImpress (PanelApplet*) { -+ oq_debug ("Starting ooimpress\n"); -+ //((Model *)pModel)->startImpress(); -+ model.startImpress(); - } - - -@@ -108,29 +124,30 @@ - /*========================================================================= - | GUI UPDATE - ========================================================================*/ --static void updateGUI (Model *model) { -+static void -+updateGUI (Model* pModel) { - IconState state = ICON_OFF; - -- switch (model->getStatus()) { -+ switch (pModel->getStatus()) { - case MODEL_OFFICE_STOPPED: state = ICON_OFF; break; - case MODEL_OFFICE_STARTING: state = ICON_WAIT; break; - case MODEL_OFFICE_RUNNING: state = ICON_ON; break; - } - - if (state != iconState) { -- int panelPixelSize = -- applet_widget_get_panel_pixel_size(APPLET_WIDGET(applet)); -+ int panelPixelSize = panel_applet_get_size (PANEL_APPLET(applet)); - gtk_widget_set_usize(tile, panelPixelSize, panelPixelSize); - -+/* FIXME - bool en = (state == ICON_ON); -- applet_widget_callback_set_sensitive(APPLET_WIDGET(applet), "sw", en); -- applet_widget_callback_set_sensitive(APPLET_WIDGET(applet), "sc", en); -- applet_widget_callback_set_sensitive(APPLET_WIDGET(applet), "si", en); -- applet_widget_callback_set_sensitive(APPLET_WIDGET(applet), "sd", en); -+ applet_widget_callback_set_sensitive(PANEL_APPLET(applet), "sw", en); -+ applet_widget_callback_set_sensitive(PANEL_APPLET(applet), "sc", en); -+ applet_widget_callback_set_sensitive(PANEL_APPLET(applet), "si", en); -+ applet_widget_callback_set_sensitive(PANEL_APPLET(applet), "sd", en); -+*/ - -- if (tilepixmap) gtk_container_remove(GTK_CONTAINER(tile), tilepixmap); -+ //if (tilepixmap) gtk_container_remove(GTK_CONTAINER(tile), tilepixmap); - tilepixmap = 0; -- - char **pixmapData = 0; - switch (state) { - case ICON_OFF: pixmapData = ooqstart_off_xpm; break; -@@ -143,12 +160,13 @@ - tilepixmap = create_pixmap(GTK_WIDGET(tile), pixmapData, - panelPixelSize, panelPixelSize); - } -- -+ -+/* - if (tilepixmap) { - gtk_widget_show(tilepixmap); - gtk_container_add(GTK_CONTAINER(tile), tilepixmap); - } -- -+*/ - iconState = state; - } - } -@@ -264,8 +282,8 @@ - gtk_idle_add(makeRequest, data); - } - -- --static void disableSessionManagement (Model *model) { -+static void -+disableSessionManagement (Model* pModel) { - // This is tricky because the X11 SM works on a callback - // basis. Essentially, what this function does is - // request all of the session manager's properties. -@@ -278,8 +296,13 @@ - // session management for the program. - SmProp *props[1]; - props[0] = mkSmProp(GsmCommand, GsmSelectClientEvents); -+ // MECHANIX: g_usleep (G_USEC_PER_SEC * 10); - SmcSetProperties((SmcConn)client->smc_conn, 1, &props[0]); -- gtk_idle_add(makeRequest, model); -+ /* MECHANIX: if (true) { -+ g_printerr ("debug return\n"); -+ return; -+ }*/ -+ gtk_idle_add (makeRequest, pModel); - } - - static gint makeRequest (gpointer data) { -@@ -291,23 +290,14 @@ - /*========================================================================= - | LOAD / SAVE CONFIGURATION - ========================================================================*/ --static void loadConfig (char *cfgpath, Model *model) { -- gnome_config_push_prefix(cfgpath); -- -- model->setOpenOfficeDir(gnome_config_get_string("ooqstart/openoffice")); -- if (gnome_config_get_bool("ooqstart/enable=false")) -- model->enable(); -- else -- model->disable(); -- -- gnome_config_pop_prefix(); -+static void -+loadConfig (Model* pModel) { -+ pModel->setOpenOfficeProgram (gnome_config_get_string (GC_PROG_PATH "=" OOFFICE_DEFAULT_PATH)); - } - --static void saveConfig (char *cfgpath, Model *model) { -- gnome_config_push_prefix(cfgpath); -- gnome_config_set_string("ooqstart/openoffice", model->getOpenOfficeDir()); -- gnome_config_set_bool("ooqstart/enable", model->getEnabled()); -- gnome_config_pop_prefix(); -+static void -+saveConfig (Model* pModel) { -+ gnome_config_set_string (GC_PROG_PATH, pModel->getOpenOfficeProgram()); - - gnome_config_sync(); - } -@@ -320,64 +310,55 @@ - { - if (propwindow == 0) return; - -- Model *model = (Model *)data; -+ Model* pModel = (Model*) data; - -- // Get the status of the checkbox -- bool enable = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox)); -- - // Check to see if the given path is valid -- model->setOpenOfficeDir(gtk_entry_get_text(GTK_ENTRY(entry))); -- if (!model->isValid()) { -- GtkWidget *dialog = gnome_message_box_new -- (_("Open Office was not found in the given path.\n" -- "The QuickStarter applet will be disabled.\n"), -- GNOME_MESSAGE_BOX_WARNING, -- GNOME_STOCK_BUTTON_OK, -- 0); -- gnome_dialog_run(GNOME_DIALOG(dialog)); -+ pModel->setOpenOfficeProgram (gtk_entry_get_text (GTK_ENTRY (entry))); -+ if (!pModel->isValid()) { -+ GtkWidget* dialog = gtk_message_dialog_new (NULL, -+ GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, -+ GTK_BUTTONS_CLOSE, -+ _("OpenOffice.org was not found in the given path.\n" -+ "The QuickStarter applet will be disabled.\n")); -+ gtk_dialog_run (GTK_DIALOG (dialog)); -+ gtk_widget_destroy (dialog); - -- // Disable the quick starter -- enable = false; - } - -- if (enable) -- model->enable(); -- else -- model->disable(); -- -- saveConfig(APPLET_WIDGET(applet)->privcfgpath, model); -- applet_widget_sync_config(APPLET_WIDGET(applet)); -+ saveConfig (pModel); -+/* FIXME: applet_widget_sync_config(PANEL_APPLET(applet)); */ - propwindow = 0; - } - --static void showHelp (AppletWidget *, gpointer) { -- GnomeHelpMenuEntry entry = { "ooqstart_applet", "index.html" }; -- gnome_help_display(0, &entry); --} - - static gint propDestroy (GtkWidget *, gpointer) { - return 0; - } - --static void properties (AppletWidget *, gpointer pModel) { -- Model *model = (Model *)pModel; -- -- propwindow = gnome_property_box_new(); -- gtk_window_set_title -- (GTK_WINDOW(&GNOME_PROPERTY_BOX(propwindow)->dialog.window), -- _("Open Office QuickStarter Applet Settings")); -+static void -+properties (PanelApplet*) { -+ Model* pModel = (Model*) &model; -+ -+ if (!pModel) { -+ return; -+ } -+ -+ propwindow = gnome_property_box_new(); -+ gtk_window_set_title (GTK_WINDOW (&GNOME_PROPERTY_BOX (propwindow)->dialog.window), -+ _("OpenOffice.org QuickStarter Settings")); - - GtkWidget *vbox = gtk_vbox_new(FALSE, GNOME_PAD_SMALL); - gtk_container_set_border_width(GTK_CONTAINER(vbox), GNOME_PAD_SMALL); - - GtkWidget *label = gtk_label_new -- (_("Full path to Open Office or Star Office base directory:")); -+ (_("Full path to the OpenOffice.org or StarOffice application:")); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); - gtk_widget_show(label); - - entry = gtk_entry_new(); -- gtk_entry_set_text(GTK_ENTRY(entry), model->getOpenOfficeDir()); -+ const gchar* prog = pModel->getOpenOfficeProgram(); -+ gtk_entry_set_text (GTK_ENTRY (entry), prog); - gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0); - GTK_WIDGET_SET_FLAGS(entry, GTK_CAN_FOCUS); - gtk_signal_connect_object -@@ -391,17 +375,6 @@ - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); - gtk_widget_show(label); - -- checkbox = gtk_check_button_new_with_label -- (_("Enable QuickStarter")); -- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), -- model->getEnabled()); -- gtk_box_pack_start(GTK_BOX(vbox), checkbox, FALSE, FALSE, 0); -- gtk_signal_connect_object -- (GTK_OBJECT(checkbox), "clicked", -- GTK_SIGNAL_FUNC(gnome_property_box_changed), -- GTK_OBJECT(propwindow)); -- gtk_widget_show(checkbox); -- - label = gtk_label_new(_("General")); - gnome_property_box_append_page - (GNOME_PROPERTY_BOX(propwindow), vbox, label); -@@ -404,27 +404,29 @@ - GTK_SIGNAL_FUNC(propApply), pModel); - gtk_signal_connect(GTK_OBJECT(propwindow), "destroy", - GTK_SIGNAL_FUNC(propDestroy), 0); -- gtk_signal_connect(GTK_OBJECT(propwindow), "help", -- GTK_SIGNAL_FUNC(showHelp), 0); - gtk_widget_show_all(propwindow); - } - --static void about (AppletWidget *, gpointer) { -+static void about (PanelApplet*, gpointer) { - static GtkWidget *about = 0; - - if (about == 0) { - const gchar *authors[4]; - authors[0] = _("Kumaran Santhanam "); -- authors[1] = 0; -+ authors[1] = _("Filip Van Raemdonck "); -+ authors[2] = 0; - - about = gnome_about_new - ( _("Open Office QuickStarter Applet"), VERSION, -- _("(C) 2002 Kumaran Santhanam"), authors, -+ _("(C) 2002 Kumaran Santhanam\n 2003 Filip Van Raemdonck"), - _("Quick starter launch applet for Open Office 641C+ " - "and Star Office 6.0+.\n" - "Right-click on the applet icon for a context menu.\n" - " \n" - "Released under the GNU General Public License v2."), -+ authors, -+ NULL, /* documenters */ -+ NULL, /* translators */ - 0); - - gtk_signal_connect(GTK_OBJECT(about), "destroy", -@@ -445,33 +471,14 @@ - - - /*========================================================================= --| MENUS -- ========================================================================*/ --static void menuItem (GtkWidget *applet, -- char *name, char *text, char *stock, -- void (*func) (AppletWidget *, gpointer), -- Model *model) --{ -- if (stock == 0) -- applet_widget_register_callback -- (APPLET_WIDGET(applet), name, _(text), func, model); -- else -- applet_widget_register_stock_callback -- (APPLET_WIDGET(applet), name, stock, _(text), func, model); --} -- --static void tileClicked (GtkWidget *w, gpointer data) { -- about((AppletWidget *)data, 0); --} -- -- --/*========================================================================= - | BACKGROUND TIMER - ========================================================================*/ --static gint timeoutFunc (gpointer pModel) { -- Model *model = (Model *)pModel; -- model->process(); -- updateGUI(model); -+static gint -+timeoutFunc (gpointer data) { -+ g_assert (data); -+ Model* pModel = (Model*) data; -+ pModel->process(); -+ updateGUI (pModel); - return TRUE; - } - -@@ -484,10 +491,11 @@ - updateGUI((Model *)data); - } - --static gint saveSession (GtkWidget *applet, gchar *privcfgpath, -+static gint saveSession (GtkWidget *applet, - gchar *globcfgpath, gpointer data) - { -- saveConfig(privcfgpath, (Model *)data); -+ oq_debug ("saveSession (..., globcfgpath = %s, ...)\n", globcfgpath); -+ saveConfig((Model *)data); - gnome_config_drop_all(); - return FALSE; - } -@@ -507,77 +489,96 @@ - - - /*========================================================================= --| MAIN PROGRAM -+| MENUS - ========================================================================*/ --int main (int argc, char **argv) --{ -- // Initialize the i18n stuff -- (void)bindtextdomain(PACKAGE, GNOMELOCALEDIR); -- (void)textdomain(PACKAGE); -- -- // intialize, this will basically set up the applet, corba and -- // call gnome_init -- applet_widget_init("ooqstart_applet", VERSION, argc, argv, NULL, 0, NULL); -- -- // create a new applet_widget -- applet = applet_widget_new("ooqstart_applet"); -- -- // in the rare case that the communication with the panel -- // failed, error out -- if (!applet) g_error("Can't create applet!\n"); -+static void tileClicked (GtkWidget *w, gpointer data) { -+ about((PanelApplet*)data, 0); -+} - -- // Get a GNOME client connected to the session manager -- client = gnome_client_new(); -- gnome_client_connect(client); -+static const gchar ooqstart_menu_xml [] = -+ "\n" -+ " " -+ " " -+ " " -+ " " -+ " \n" -+ " \n" -+ "\n"; - -- // create the widget we are going to put on the applet -- tile = gtk_button_new(); -- gtk_button_set_relief(GTK_BUTTON(tile), GTK_RELIEF_NONE); -- GTK_WIDGET_UNSET_FLAGS(tile, GTK_CAN_FOCUS); -- gtk_widget_show(tile); -- gtk_signal_connect(GTK_OBJECT(tile), "clicked", -- GTK_SIGNAL_FUNC(tileClicked), applet); -- -- // add the widget to the applet-widget, and thereby actually -- // putting it "onto" the panel -- applet_widget_add(APPLET_WIDGET(applet), tile); -- gtk_widget_show(applet); -+/*========================================================================= -+| MAIN PROGRAM -+ ========================================================================*/ -+static gboolean -+ooqstart_applet_new (PanelApplet* papplet) { -+ oq_debug ("Creating new applet"); -+ -+ -+ applet = GTK_WIDGET (papplet); -+ -+ GtkWidget* img = gtk_image_new_from_file ("/usr/share/pixmaps/gnome-ooqstart.png"); -+ tile = gtk_event_box_new(); -+ gtk_container_add (GTK_CONTAINER (tile), img); -+ gtk_container_add (GTK_CONTAINER (applet), tile); -+ -+ gtk_widget_show_all(applet); -+ -+ const BonoboUIVerb ooqstart_menu_verbs[] = { -+ BONOBO_UI_UNSAFE_VERB ("OOQStartWriter", startWriter), -+ BONOBO_UI_UNSAFE_VERB ("OOQStartCalc", startCalc), -+ BONOBO_UI_UNSAFE_VERB ("OOQStartImpress", startImpress), -+ BONOBO_UI_UNSAFE_VERB ("OOQStartDraw", startDraw), -+ BONOBO_UI_UNSAFE_VERB ("OOQPrefs", properties), -+ BONOBO_UI_UNSAFE_VERB ("OOQAbout", about), -+ BONOBO_UI_VERB_END -+ }; - -- // initialize the model -- Model model; -+ panel_applet_setup_menu (PANEL_APPLET (applet), ooqstart_menu_xml, ooqstart_menu_verbs, tile); - - // connect the applet callbacks -- gtk_signal_connect(GTK_OBJECT(applet), "change_pixel_size", -- GTK_SIGNAL_FUNC(resizeApplet), &model); -- gtk_signal_connect(GTK_OBJECT(applet), "save_session", -- GTK_SIGNAL_FUNC(saveSession), &model); -- gtk_signal_connect(GTK_OBJECT(applet), "destroy", -- GTK_SIGNAL_FUNC(destroyApplet), &model); -- -- // add the items to the applet menu -- menuItem(applet, "props", "Properties...", -- GNOME_STOCK_PIXMAP_PROPERTIES, -- properties, &model); -- menuItem(applet, "about", "About...", -- GNOME_STOCK_PIXMAP_ABOUT, -- about, 0); -- menuItem(applet, "help", "Help", -- GNOME_STOCK_PIXMAP_HELP, -- showHelp, 0); -- -- char *icon = 0; -- menuItem(applet, "sw", "New Text Document", icon, startWriter, &model); -- menuItem(applet, "sc", "New Spreadsheet", icon, startCalc, &model); -- menuItem(applet, "si", "New Presentation", icon, startImpress, &model); -- menuItem(applet, "sd", "New Drawing", icon, startDraw, &model); -+ if (false) { -+ g_signal_connect (G_OBJECT (tile), "clicked", G_CALLBACK (tileClicked), applet); -+ g_signal_connect (G_OBJECT (applet), "change_pixel_size", G_CALLBACK (resizeApplet), &model); -+ g_signal_connect (G_OBJECT (applet), "save_session", G_CALLBACK (saveSession), &model); -+ g_signal_connect (G_OBJECT (applet), "destroy", G_CALLBACK (destroyApplet), &model); -+ } -+ -+ loadConfig (&model); -+ oq_debug ("%s\n", model.getOpenOfficeProgram()); - -- loadConfig(APPLET_WIDGET(applet)->privcfgpath, &model); -+ // Get a GNOME client connected to the session manager -+ client = gnome_client_new(); -+ gnome_client_connect(client); -+ gnome_client_flush(client); - - // install appropriate handlers -- disableSessionManagement(&model); -- timeout = gtk_timeout_add(250, timeoutFunc, (gpointer)&model); -+ disableSessionManagement (&model); -+ timeout = gtk_timeout_add (250, timeoutFunc, (gpointer) &model); - -- // special corba main loop -- applet_widget_gtk_main(); -- return 0; -+ return TRUE; - } -+ -+static gboolean -+ooqstart_applet_factory (PanelApplet* papplet, -+ const gchar* iid, gpointer data) { -+ oq_debug ("Factory called"); -+ -+ if (strcmp (iid, "OAFIID:GNOME_OOQStartApplet")) { -+ g_printerr ("Returning FALSE"); -+ return FALSE; -+ } -+ -+ return ooqstart_applet_new (papplet); -+} -+ -+PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_OOQStartApplet_Factory", -+ PANEL_TYPE_APPLET, -+ "OOoQStartApplet", -+ "0", -+ ooqstart_applet_factory, -+ NULL) - ---- ooqstart-0.8.3.orig/gnome/GNOME_OOQStartApplet.server -+++ ooqstart-0.8.3/gnome/GNOME_OOQStartApplet.server -@@ -0,0 +1,35 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ---- ooqstart-0.8.3.orig/help/index.html -+++ ooqstart-0.8.3/help/index.html -@@ -25,7 +25,7 @@ - Public License v2, though any later version of the license - may be used at your option. - --

For more information, please see the full -+

For more information, please see the full - text of the license. Further details can be found at the - GNU Project Homepage. - ---- ooqstart-0.8.3.orig/model.cxx -+++ ooqstart-0.8.3/model.cxx -@@ -2,6 +2,7 @@ - | Open Office QuickStarter - |-------------------------------------------------------------------------- - | (c) 2002 Kumaran Santhanam -+| 2003 Filip Van Raemdonck - | - | This project is released under the GNU General Public License. - | Please see the file COPYING for more details. -@@ -18,7 +19,6 @@ - static const int MIN_TIME = 2; // seconds - - static const char *BIN_SH = "/bin/sh"; --static const char *SOFFICE = "program/soffice"; - static const char *SWRITER = "private:factory/swriter"; - static const char *SCALC = "private:factory/scalc"; - static const char *SDRAW = "private:factory/sdraw"; -@@ -66,7 +66,10 @@ - signal(SIGCHLD, sigchld); - - // Fork and return the child's process ID -- if ((pid = fork()) != 0) return pid; -+ if ((pid = fork()) != 0) { -+ //fprintf (stderr, "fork pid %d\n", pid); -+ return pid; -+ } - - // Child process execution point - execl(path, path, arg1, arg2, arg3, 0); -@@ -72,7 +72,7 @@ - } - - // Child process execution point -- execl(path, path, arg1, arg2, arg3, 0); -+ execlp(arg1,arg1, arg2, arg3, 0); - - // Execution should never reach this point. - // If it does, there was an error. -@@ -95,17 +95,15 @@ - | CONSTRUCTOR / DESTRUCTOR - ========================================================================*/ - Model::Model () { -- _enabled = false; -+ _enabled = true; - _daemonPID = 0; - _tick = 0; - _status = MODEL_OFFICE_STOPPED; -- _sofficeDir = 0; - _soffice = 0; - } - - Model::~Model () { - stopProcess(_daemonPID); -- if (_sofficeDir) free(_sofficeDir); - if (_soffice) free(_soffice); - } - -@@ -113,32 +114,25 @@ - /*========================================================================= - | OPEN OFFICE DIRECTORY - ========================================================================*/ --// Sets the open office directory if the path is valid --void Model::setOpenOfficeDir (const char *dir) { -- char path[1024]; -- -- if (dir == 0) dir = ""; -- sprintf(path, "%s/%s", dir, SOFFICE); -- -- // Free the memory used by the previous path -- if (_soffice) free(_soffice); -- _soffice = 0; -- -+/* Sets the OpenOffice.org location if the path is valid */ -+void -+Model::setOpenOfficeProgram (const char* path) { - // Stat the path to see if it really exists -+ fprintf (stderr, "_soffice: %s\nnew path: %s\n", _soffice, path); - struct stat buf; - stat(path, &buf); - if (S_ISREG(buf.st_mode)) { -+ if (_soffice) { -+ free (_soffice); -+ } - _soffice = strdup(path); -- } -+ fprintf (stderr, "_soffice: %s\n", _soffice); - -- // Save away the directory -- if (_sofficeDir) free(_sofficeDir); -- _sofficeDir = strdup(dir); -- -- // Make sure to stop the current running process -- stopProcess(_daemonPID); -- _daemonPID = 0; -- _tick = time(0); -+ /* Make sure to stop the current running process */ -+ stopProcess (_daemonPID); -+ _daemonPID = 0; -+ _tick = time (0); -+ } - } - - -@@ -171,6 +165,7 @@ - _status = MODEL_OFFICE_STARTING; - _tick = time(0); - } -+ //fprintf (stderr, "started _daemonPID %d\n", _daemonPID); - } - - // If the quickstarter is disabled, terminate the -@@ -186,11 +181,24 @@ - /*========================================================================= - | LAUNCHERS - ========================================================================*/ --#define START_APP(app) \ -- if (isRunning(_daemonPID) && _soffice != 0) \ -- { startProcess(BIN_SH, _soffice, app, 0); } -- --void Model::startWriter () const { START_APP(SWRITER); } --void Model::startCalc () const { START_APP(SCALC); } --void Model::startDraw () const { START_APP(SDRAW); } --void Model::startImpress () const { START_APP(SIMPRESS); } -+void -+Model::startApp (const char* app) { -+ fprintf (stderr, "starting app %s\n", app); -+ -+ if (_daemonPID) { -+ fprintf (stderr, "checking _daemonPID %d\n", _daemonPID); -+ int result = waitpid (_daemonPID, 0, WNOHANG); -+ if (result < 0 && errno == ECHILD) { -+ fprintf (stderr, "_daemonPid %d, waitpid %d, ECHILD %d\n", _daemonPID, result, (errno == ECHILD)); -+ return; -+ } else if (_soffice) { -+ startProcess (BIN_SH, _soffice, app, 0); -+ } -+ } -+} -+ -+void Model::startWriter (void) { startApp (SWRITER); } -+void Model::startCalc (void) { startApp (SCALC); } -+void Model::startDraw (void) { startApp (SDRAW); } -+void Model::startImpress (void) { startApp (SIMPRESS); } -+ ---- ooqstart-0.8.3.orig/model.h -+++ ooqstart-0.8.3/model.h -@@ -2,6 +2,7 @@ - | Open Office QuickStarter - |-------------------------------------------------------------------------- - | (c) 2002 Kumaran Santhanam -+| 2003 Filip Van Raemdonck - | - | This project is released under the GNU General Public License. - | Please see the file COPYING for more details. -@@ -39,10 +40,7 @@ - Model (); - ~Model (); - -- void setOpenOfficeDir (const char *dir); -- const char *getOpenOfficeDir () const { -- return _sofficeDir; -- } -+ void setOpenOfficeProgram (const char*); - const char *getOpenOfficeProgram () const { - return _soffice; - } -@@ -57,11 +55,12 @@ - void process (); - ModelStatus getStatus () const { return _status; } - -- void startWriter () const; -- void startCalc () const; -- void startDraw () const; -- void startImpress () const; -+ void startApp (const char*); - -+ void startWriter (void); -+ void startCalc (void); -+ void startDraw (void); -+ void startImpress (void); - - private: - bool _enabled; -@@ -69,9 +68,7 @@ - time_t _tick; - ModelStatus _status; - -- char *_sofficeDir; - char *_soffice; - }; - -- - #endif diff --git a/app-office/ooqstart-gnome/files/gnome2update.patch.bz2 b/app-office/ooqstart-gnome/files/gnome2update.patch.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..585d3c3b42929dd0211c7ec0f194ef4272356916 GIT binary patch literal 8004 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 G6u>lv-K}r{ literal 0 HcmV?d00001 diff --git a/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3.ebuild b/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3.ebuild index 489a303e3f56..2e04556ff9ea 100644 --- a/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3.ebuild +++ b/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3.ebuild,v 1.1 2005/01/16 15:05:34 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3.ebuild,v 1.2 2005/01/16 15:15:11 suka Exp $ inherit gnome2 eutils @@ -26,7 +26,7 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} cd ${S} - epatch ${FILESDIR}/gnome2update.patch + epatch ${FILESDIR}/gnome2update.patch.bz2 } src_compile() { -- 2.26.2