callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added #include <e-summary-callbacks.h>. (destroy_prefs_cb): Added a cast.

Browse Source 
2000-12-12  Christopher James Lahey  <clahey@helixcode.com>

	* component/e-summary-callbacks.c: Added #include
	<e-summary-callbacks.h>.
	(destroy_prefs_cb): Added a cast.
	(configure_summary): Added a cast.

	* component/e-summary-callbacks.h: Added #include "e-summary.h"

	* component/e-summary-url.c (e_summary_url_click): Removed an
	unused variable.

	* component/e-summary-util.c: Added #include <e-summary-util.h>

	* component/e-summary.c: Added #include <gtkhtml/htmlselection.h>.
	(e_summary_queue_rebuild): Added a cast.

	* component/main.c: Added #include <glade/glade.h>.

	* test-service/main.c: Changed some variable types to make casting
	easier.

	* test-service/rdf-summary.c: Changed some variable types to make
	casting easier.

svn path=/trunk/; revision=6953
This commit is contained in:
Christopher James Lahey
2000-12-12 23:29:56 +00:00
committed by Chris Lahey
parent 55940a77ad
commit 9b7a92e8ea
9 changed files with 63 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
executive-summary/ChangeLog
View File

@ -1,3 +1,28 @@
2000-12-12 Christopher James Lahey <clahey@helixcode.com>
* component/e-summary-callbacks.c: Added #include
<e-summary-callbacks.h>.
(destroy_prefs_cb): Added a cast.
(configure_summary): Added a cast.
* component/e-summary-callbacks.h: Added #include "e-summary.h"
* component/e-summary-url.c (e_summary_url_click): Removed an
unused variable.
* component/e-summary-util.c: Added #include <e-summary-util.h>
* component/e-summary.c: Added #include <gtkhtml/htmlselection.h>.
(e_summary_queue_rebuild): Added a cast.
* component/main.c: Added #include <glade/glade.h>.
* test-service/main.c: Changed some variable types to make casting
easier.
* test-service/rdf-summary.c: Changed some variable types to make
casting easier.
2000-12-12 Dan Winship <danw@helixcode.com>
* Makefile.am (EXTRA_DIST): Add stuff. (From campd.)
@ -5,8 +30,8 @@
2000-12-11 Iain Holmes <iain@helixcode.com>
* evolution-services/executive-summary-html-view.h: Add a define
for the "html_changed" signal to name space it. Change the function
declarations to fit with the below change too.
for the "html_changed" signal to name space it. Change the
function declarations to fit with the below change too.
* evolution-services/executive-summary-html-view.c
(executive_summary_html_view_new): Create a default BonoboEventSource

5
executive-summary/component/e-summary-callbacks.c
View File

@ -31,6 +31,7 @@
#include <liboaf/liboaf.h>
#include <glade/glade.h>
#include <e-summary-callbacks.h>
#include "e-summary.h"
@ -128,7 +129,7 @@ static void
destroy_prefs_cb (GtkObject *object,
PropertyData *data)
{
gtk_object_unref (data->xml);
gtk_object_unref (GTK_OBJECT(data->xml));
g_free (data);
}
@ -191,7 +192,7 @@ configure_summary (GtkWidget *widget,
data->xml = glade_xml_new (EVOLUTION_GLADEDIR
"/executive-summary-config.glade", NULL);
prefs = glade_xml_get_widget (data->xml, "summaryprefs");
data->box = prefs;
data->box = GNOME_PROPERTY_BOX(prefs);
html_page = glade_xml_get_widget (data->xml, "htmlpage");
if (esummary->prefs->page != NULL)

2
executive-summary/component/e-summary-callbacks.h
View File

@ -1,6 +1,8 @@
#ifndef __E_SUMMARY_CALLBACKS_H__
#define __E_SUMMARY_CALLBACKS_H__
#include "e-summary.h"
void embed_service (GtkWidget *widget,
ESummary *esummary);
void new_mail (GtkWidget *widget,

2
executive-summary/component/e-summary-url.c
View File

@ -462,8 +462,6 @@ e_summary_url_click (GtkWidget *widget,
num_pages = Bonobo_PropertyControl__get_pageCount (window->propertycontrol, &ev);
for (i = 0; i < num_pages; i++) {
char *pagename;
control = Bonobo_PropertyControl_getControl (window->propertycontrol, i, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("Unable to get property control.");

2
executive-summary/component/e-summary-util.c
View File

@ -21,6 +21,8 @@
* Boston, MA 02111-1307, USA.
*/
#include <e-summary-util.h>
#include <gnome.h>
char *

3
executive-summary/component/e-summary.c
View File

@ -32,6 +32,7 @@
#include <gtkhtml/gtkhtml-embedded.h>
#include <gtkhtml/gtkhtml-stream.h>
#include <gtkhtml/htmlengine.h>
#include <gtkhtml/htmlselection.h>
#include <gal/util/e-util.h>
#include <gal/widgets/e-gui-utils.h>
@ -617,7 +618,7 @@ e_summary_queue_rebuild (ESummary *esummary)
if (priv->idle != 0)
return;
priv->idle = g_idle_add (e_summary_rebuild_page, esummary);
priv->idle = g_idle_add ((GSourceFunc) e_summary_rebuild_page, esummary);
}
static void

1
executive-summary/component/main.c
View File

@ -27,6 +27,7 @@
#include <bonobo/bonobo-main.h>
#include <bonobo/bonobo-object-directory.h>
#include <liboaf/liboaf.h>
#include <glade/glade.h>
#ifdef GTKHTML_HAVE_GCONF
#include <gconf/gconf.h>

12
executive-summary/test-service/main.c
View File

@ -173,7 +173,9 @@ static BonoboObject *
create_view (ExecutiveSummaryComponentFactory *_factory,
void *closure)
{
BonoboObject *component, *view, *bag, *stream;
BonoboObject *component, *view;
BonoboPersistStream *stream;
BonoboPropertyBag *bag;
UserData *ud;
/* Create the component object */
@ -213,24 +215,24 @@ create_view (ExecutiveSummaryComponentFactory *_factory,
window_title: For the window title.
window_icon: For the window icon.
*/
bonobo_property_bag_add (BONOBO_PROPERTY_BAG (bag),
bonobo_property_bag_add (bag,
"window_title", PROPERTY_TITLE,
BONOBO_ARG_STRING,
NULL,
"The title of this components window", 0);
bonobo_property_bag_add (BONOBO_PROPERTY_BAG (bag),
bonobo_property_bag_add (bag,
"window_icon", PROPERTY_ICON,
BONOBO_ARG_STRING,
NULL,
"The icon for this component's window", 0);
/* Now add the interface */
bonobo_object_add_interface (component, bag);
bonobo_object_add_interface (component, BONOBO_OBJECT(bag));
/* Add the Bonobo::PersistStream interface */
stream = bonobo_persist_stream_new (load_from_stream, save_to_stream,
NULL, content_types, NULL);
bonobo_object_add_interface (component, stream);
bonobo_object_add_interface (component, BONOBO_OBJECT(stream));
running_views++;
/* Return the ExecutiveSummaryComponent object */

35
executive-summary/test-service/rdf-summary.c
View File

@ -40,8 +40,8 @@ enum {
struct _RdfSummary {
BonoboObject *component;
BonoboObject *view;
BonoboObject *bag;
BonoboObject *property_control;
BonoboPropertyBag *bag;
BonoboPropertyControl *property_control;
GtkWidget *rdf;
GtkWidget *g_limit;
@ -194,7 +194,7 @@ tree_walk (xmlNodePtr root,
arg = bonobo_arg_new (BONOBO_ARG_STRING);
BONOBO_ARG_SET_STRING (arg, t);
bonobo_property_bag_set_value (BONOBO_PROPERTY_BAG (summary->bag),
bonobo_property_bag_set_value (summary->bag,
"window_title", (const BonoboArg *) arg,
NULL);
bonobo_arg_release (arg);
@ -212,7 +212,7 @@ tree_walk (xmlNodePtr root,
icon = layer_find_url (image->childs, "url", "apple-red.png");
arg = bonobo_arg_new (BONOBO_ARG_STRING);
BONOBO_ARG_SET_STRING (arg, icon);
bonobo_property_bag_set_value (BONOBO_PROPERTY_BAG (summary->bag),
bonobo_property_bag_set_value (summary->bag,
"window_icon",
(const BonoboArg *) arg, NULL);
bonobo_arg_release (arg);
@ -417,7 +417,7 @@ static void
entry_changed (GtkEntry *entry,
RdfSummary *summary)
{
bonobo_property_control_changed (BONOBO_PROPERTY_CONTROL (summary->property_control), NULL);
bonobo_property_control_changed (summary->property_control, NULL);
}
static BonoboControl *
@ -481,7 +481,7 @@ property_action (GtkObject *property_control,
g_free (summary->location);
summary->location = g_strdup (gtk_entry_get_text (GTK_ENTRY (summary->rdf)));
summary->limit = atoi (gtk_entry_get_text (GTK_ENTRY (summary->g_limit)));
g_idle_add (download, summary);
g_idle_add ((GSourceFunc) download, summary);
break;
case Bonobo_PropertyControl_HELP:
@ -498,7 +498,10 @@ create_view (ExecutiveSummaryComponentFactory *_factory,
void *closure)
{
RdfSummary *summary;
BonoboObject *component, *view, *bag, *property, *event_source;
BonoboObject *component, *view;
BonoboEventSource *event_source;
BonoboPropertyBag *bag;
BonoboPropertyControl *property;
char *html = "<b>Loading RDF file. . .<br>Please wait</b>";
summary = g_new (RdfSummary, 1);
@ -518,7 +521,7 @@ create_view (ExecutiveSummaryComponentFactory *_factory,
interface aggregated */
event_source = bonobo_event_source_new ();
view = executive_summary_html_view_new_full (BONOBO_EVENT_SOURCE (event_source));
view = executive_summary_html_view_new_full (event_source);
summary->view = view;
executive_summary_html_view_set_html (EXECUTIVE_SUMMARY_HTML_VIEW (view),
html);
@ -526,28 +529,28 @@ create_view (ExecutiveSummaryComponentFactory *_factory,
bag = bonobo_property_bag_new (get_prop, set_prop, summary);
summary->bag = bag;
bonobo_property_bag_add (BONOBO_PROPERTY_BAG (bag),
bonobo_property_bag_add (bag,
"window_title", PROPERTY_TITLE,
BONOBO_ARG_STRING, NULL,
"The title of this component's window", 0);
bonobo_property_bag_add (BONOBO_PROPERTY_BAG (bag),
bonobo_property_bag_add (bag,
"window_icon", PROPERTY_ICON,
BONOBO_ARG_STRING, NULL,
"The icon for this component's window", 0);
bonobo_object_add_interface (component, bag);
bonobo_object_add_interface (component, BONOBO_OBJECT(bag));
property = bonobo_property_control_new_full (property_control, 1,
BONOBO_EVENT_SOURCE (event_source),
event_source,
summary);
summary->property_control = property;
gtk_signal_connect (GTK_OBJECT (property), "action",
GTK_SIGNAL_FUNC (property_action), summary);
bonobo_object_add_interface (component, property);
bonobo_object_add_interface (component, BONOBO_OBJECT(property));
running_views++;
gtk_timeout_add (5000, download, summary);
gtk_timeout_add (5000, (GSourceFunc) download, summary);
return component;
}
@ -556,10 +559,10 @@ static BonoboObject *
factory_fn (BonoboGenericFactory *_factory,
void *closure)
{
ExecutiveSummaryComponentFactory *component_factory;
BonoboObject *component_factory;
component_factory = executive_summary_component_factory_new (create_view, NULL);
return BONOBO_OBJECT (component_factory);
return component_factory;
}
static void