[evolution-patches] Cleanups for evolution/plugins
- From: Kjartan Maraas <kmaraas broadpark no>
- To: evolution-patches <evolution-patches gnome org>
- Subject: [evolution-patches] Cleanups for evolution/plugins
- Date: Sat, 10 Dec 2005 22:17:16 +0100
Same as the others.
Cheers
Kjartan
? addressbook-file/Makefile
? addressbook-file/Makefile.in
? addressbook-file/org-gnome-addressbook-file.eplug
? default-mailer/Makefile
? default-mailer/Makefile.in
? default-mailer/apps-evolution-mail-prompts-checkdefault-2.6.schemas
? default-mailer/org-gnome-default-mailer.eplug
? default-mailer/org-gnome-default-mailer.error
? default-source/Makefile
? default-source/Makefile.in
? default-source/org-gnome-default-source.eplug
? exchange-operations/Makefile
? exchange-operations/Makefile.in
? exchange-operations/org-gnome-exchange-operations.eplug
? exchange-operations/org-gnome-exchange-operations.error
? groupwise-account-setup/Makefile
? groupwise-account-setup/Makefile.in
? groupwise-account-setup/org-gnome-gw-account-setup.eplug
? groupwise-features/Makefile
? groupwise-features/Makefile.in
? groupwise-features/org-gnome-groupwise-features.eplug
? hula-account-setup/Makefile
? hula-account-setup/Makefile.in
? hula-account-setup/org-gnome-evolution-hula-account-setup.eplug
? ipod-sync/Makefile
? ipod-sync/Makefile.in
? itip-formatter/org-gnome-itip-formatter.error
? mail-account-disable/Makefile
? mail-account-disable/Makefile.in
? mail-account-disable/org-gnome-mail-account-disable.eplug
? mail-remote/Makefile
? mail-remote/Makefile.in
? mailing-list-actions/org-gnome-mailing-list-actions.error
? mark-all-read/Makefile
? mark-all-read/Makefile.in
? mark-all-read/org-gnome-mark-all-read.eplug
? mono/Makefile
? mono/Makefile.in
? new-mail-notify/Makefile
? new-mail-notify/Makefile.in
? new-mail-notify/org-gnome-new-mail-notify.eplug
? print-message/Makefile
? print-message/Makefile.in
? print-message/org-gnome-print-message.eplug
? profiler/Makefile
? profiler/Makefile.in
? sa-junk-plugin/Makefile
? sa-junk-plugin/Makefile.in
? sa-junk-plugin/org-gnome-sa-junk-plugin.eplug
Index: audio-inline/audio-inline.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/audio-inline/audio-inline.c,v
retrieving revision 1.5
diff -u -p -r1.5 audio-inline.c
--- audio-inline/audio-inline.c 26 Nov 2004 15:52:59 -0000 1.5
+++ audio-inline/audio-inline.c 10 Dec 2005 21:16:29 -0000
@@ -31,7 +31,7 @@
void org_gnome_audio_inline_format (void *ep, EMFormatHookTarget *t);
-volatile static int org_gnome_audio_class_id_counter = 0;
+static volatile int org_gnome_audio_class_id_counter = 0;
struct _org_gnome_audio_inline_pobject {
EMFormatHTMLPObject object;
@@ -252,7 +252,6 @@ static void
org_gnome_audio_inline_add_button (GtkWidget *box, char *icon_name, GCallback cb, gpointer data)
{
GtkWidget *icon, *button;
- GdkPixbuf *pixbuf;
icon = e_icon_factory_get_image (icon_name, E_ICON_SIZE_LARGE_TOOLBAR);
gtk_widget_show (icon);
Index: exchange-operations/exchange-account-setup.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-account-setup.c,v
retrieving revision 1.23
diff -u -p -r1.23 exchange-account-setup.c
--- exchange-operations/exchange-account-setup.c 26 Nov 2005 09:22:36 -0000 1.23
+++ exchange-operations/exchange-account-setup.c 10 Dec 2005 21:16:30 -0000
@@ -192,8 +192,10 @@ org_gnome_exchange_settings(EPlugin *epl
GtkFrame *frm_auth;
GtkVBox *vbox_auth;
GtkTable *tbl_auth;
+#ifdef HAVE_KRB5
GtkLabel *lbl_chpass;
GtkButton *btn_chpass;
+#endif
GtkLabel *lbl_dass;
GtkButton *btn_dass;
@@ -369,27 +371,15 @@ org_gnome_exchange_settings(EPlugin *epl
static void
print_error (const char *owa_url, E2kAutoconfigResult result)
{
- char *old, *new;
-
switch (result) {
case E2K_AUTOCONFIG_CANT_CONNECT:
- if (!strncmp (owa_url, "http:", 5)) {
- old = "http";
- new = "https";
- } else {
- old = "https";
- new = "http";
- }
-
e_error_run (NULL, ERROR_DOMAIN ":account-connect-error", "", NULL);
-
break;
case E2K_AUTOCONFIG_CANT_RESOLVE:
-
e_error_run (NULL, ERROR_DOMAIN ":account-resolve-error", "", NULL);
- break;
+ break;
case E2K_AUTOCONFIG_AUTH_ERROR:
case E2K_AUTOCONFIG_AUTH_ERROR_TRY_NTLM:
Index: exchange-operations/exchange-delegates.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-delegates.c,v
retrieving revision 1.3
diff -u -p -r1.3 exchange-delegates.c
--- exchange-operations/exchange-delegates.c 25 Jul 2005 06:12:03 -0000 1.3
+++ exchange-operations/exchange-delegates.c 10 Dec 2005 21:16:30 -0000
@@ -645,7 +645,8 @@ delegates_apply (ExchangeDelegates *dele
GByteArray *entryid_dup;
char *error = NULL;
E2kProperties *props;
- int i, status;
+ int i;
+ E2kGlobalCatalogStatus status;
if (!delegates->loaded_folders)
return;
@@ -681,11 +682,8 @@ delegates_apply (ExchangeDelegates *dele
}
if ((delegates->removed_users || delegates->added_users) && !delegates->self_dn) {
- E2kGlobalCatalog *gc;
- E2kGlobalCatalogStatus status;
E2kGlobalCatalogEntry *entry;
- gc = exchange_account_get_global_catalog (delegates->account);
status = e2k_global_catalog_lookup (
gc, NULL, /* FIXME: cancellable */
E2K_GLOBAL_CATALOG_LOOKUP_BY_LEGACY_EXCHANGE_DN,
Index: exchange-operations/exchange-folder-size-display.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-folder-size-display.c,v
retrieving revision 1.8
diff -u -p -r1.8 exchange-folder-size-display.c
--- exchange-operations/exchange-folder-size-display.c 24 Aug 2005 09:43:41 -0000 1.8
+++ exchange-operations/exchange-folder-size-display.c 10 Dec 2005 21:16:30 -0000
@@ -114,7 +114,6 @@ exchange_folder_size_display (GtkListSto
GtkWidget *dialog, *table;
GList *l;
char *col_name;
- int response;
printf ("exchange_folder_size_display called\n");
g_return_if_fail (GTK_IS_WIDGET (parent));
@@ -151,6 +150,6 @@ exchange_folder_size_display (GtkListSto
column);
gtk_tree_view_set_model (GTK_TREE_VIEW (table),
GTK_TREE_MODEL (model));
- response = gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
Index: exchange-operations/exchange-folder.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-folder.c,v
retrieving revision 1.15
diff -u -p -r1.15 exchange-folder.c
--- exchange-operations/exchange-folder.c 3 Oct 2005 11:33:31 -0000 1.15
+++ exchange-operations/exchange-folder.c 10 Dec 2005 21:16:30 -0000
@@ -333,12 +333,9 @@ unsubscribe_dialog_ab_response (GtkDialo
gchar *path = NULL;
gchar *uri = NULL;
const char *source_uid = NULL;
- GConfClient *client;
ESourceGroup *source_group = NULL;
ESource *source = NULL;
EABPopupTargetSource *target = data;
-
- client = gconf_client_get_default ();
account = exchange_operations_get_exchange_account ();
Index: groupwise-features/install-shared.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/install-shared.c,v
retrieving revision 1.6
diff -u -p -r1.6 install-shared.c
--- groupwise-features/install-shared.c 30 Sep 2005 12:30:21 -0000 1.6
+++ groupwise-features/install-shared.c 10 Dec 2005 21:16:30 -0000
@@ -154,7 +154,7 @@ accept_clicked(GnomeDruidPage *page, Gtk
{
EMFolderTreeModel *model;
EMFolderTree *folder_tree;
- GtkWidget *dialog ;
+ GtkWidget *dialog;
struct AcceptData *accept_data;
char *uri;
@@ -186,18 +186,15 @@ org_gnome_popup_wizard (EPlugin *ep, EME
GtkWidget *window;
GnomeDruid *wizard;
GnomeDruidPageEdge *title_page;
- CamelMimeMessage *msg = (CamelMimeMessage *) target->message ;
- CamelStreamMem *content ;
+ CamelMimeMessage *msg = (CamelMimeMessage *) target->message;
+ CamelStreamMem *content;
CamelDataWrapper *dw;
- CamelMimePart *mime_part ;
- char *notification;
char *start_message;
if (!msg)
- return ;
+ return;
- mime_part = CAMEL_MIME_PART(msg) ;
- if ((notification = (char *)camel_medium_get_header (CAMEL_MEDIUM(msg),"X-notification")) == NULL
+ if (((char *)camel_medium_get_header (CAMEL_MEDIUM(msg),"X-notification")) == NULL
|| (from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message)) == NULL
|| !camel_internet_address_get(from_addr, 0, &name, &email)
|| (dw = camel_medium_get_content_object (CAMEL_MEDIUM (msg))) == NULL) {
@@ -210,7 +207,7 @@ org_gnome_popup_wizard (EPlugin *ep, EME
}
content = (CamelStreamMem *)camel_stream_mem_new();
- camel_data_wrapper_write_to_stream(dw, (CamelStream *)content) ;
+ camel_data_wrapper_write_to_stream(dw, (CamelStream *)content);
camel_stream_write((CamelStream *)content, "", 1);
from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message);
Index: groupwise-features/junk-settings.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/junk-settings.c,v
retrieving revision 1.2
diff -u -p -r1.2 junk-settings.c
--- groupwise-features/junk-settings.c 24 Aug 2005 03:15:26 -0000 1.2
+++ groupwise-features/junk-settings.c 10 Dec 2005 21:16:30 -0000
@@ -374,7 +374,6 @@ static void
junk_settings_construct (JunkSettings *js)
{
GladeXML *xml;
- GtkWidget *box;
xml = glade_xml_new (EVOLUTION_GLADEDIR "/junk-settings.glade", ROOTNODE, NULL);
js->xml =xml;
@@ -401,7 +400,6 @@ junk_settings_construct (JunkSettings *j
js->entry = GTK_ENTRY (glade_xml_get_widget (js->xml, "entry4"));
/*TODO:connect entry and label*/
- box = GTK_WIDGET (glade_xml_get_widget (js->xml, "hbox227"));
gtk_widget_show ((GtkWidget *) js->entry);
js->scrolled_window = GTK_WIDGET (glade_xml_get_widget (js->xml,"scrolledwindow4"));
Index: groupwise-features/proxy.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/proxy.c,v
retrieving revision 1.14
diff -u -p -r1.14 proxy.c
--- groupwise-features/proxy.c 5 Dec 2005 06:04:12 -0000 1.14
+++ groupwise-features/proxy.c 10 Dec 2005 21:16:30 -0000
@@ -75,7 +75,7 @@
static GObjectClass *parent_class = NULL;
-static int proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EAccount *account);
+static gboolean proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EAccount *account);
struct _proxyDialogPrivate {
/* Glade XML data for the Add/Edit Proxy dialog*/
@@ -720,7 +720,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHo
return NULL;
}
-static int
+static gboolean
proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EAccount *account)
{
proxyDialog *prd;
@@ -729,7 +729,7 @@ proxy_page_changed_cb (GtkNotebook *note
prd = g_object_get_data ((GObject *) account, "prd");
if (!prd || !prd->priv)
- return;
+ return TRUE;
priv = prd->priv;
@@ -738,7 +738,7 @@ proxy_page_changed_cb (GtkNotebook *note
return NULL;
proxy_update_tree_view (account);
}
- return TRUE;
+ return FALSE;
}
static void
Index: groupwise-features/send-options.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/send-options.c,v
retrieving revision 1.3
diff -u -p -r1.3 send-options.c
--- groupwise-features/send-options.c 7 Jul 2005 17:06:27 -0000 1.3
+++ groupwise-features/send-options.c 10 Dec 2005 21:16:30 -0000
@@ -250,10 +250,6 @@ send_options_finalize ()
static void
e_send_options_copy_general_opts (ESendOptionsGeneral *gopts, EGwSendOptionsGeneral *ggopts)
{
- time_t temp;
-
- temp = time (NULL);
-
ggopts->priority = gopts->priority;
ggopts->reply_enabled = gopts->reply_enabled;
@@ -498,7 +494,7 @@ add_send_options_to_source (EGwSendOptio
ESource *csource, *tsource;
ESourceList *list;
EGwSendOptionsGeneral *gopts;
- EGwSendOptionsStatusTracking *topts, *mopts, *copts;
+ EGwSendOptionsStatusTracking *topts, *copts;
list = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources");
csource = get_source (list);
@@ -507,7 +503,6 @@ add_send_options_to_source (EGwSendOptio
tsource = get_source (list);
gopts = e_gw_sendoptions_get_general_options (n_opts);
- mopts = e_gw_sendoptions_get_status_tracking_options (n_opts, "mail");
copts = e_gw_sendoptions_get_status_tracking_options (n_opts, "calendar");
topts = e_gw_sendoptions_get_status_tracking_options (n_opts, "task");
Index: hula-account-setup/camel-hula-listener.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/hula-account-setup/camel-hula-listener.c,v
retrieving revision 1.2
diff -u -p -r1.2 camel-hula-listener.c
--- hula-account-setup/camel-hula-listener.c 14 Nov 2005 19:34:06 -0000 1.2
+++ hula-account-setup/camel-hula-listener.c 10 Dec 2005 21:16:30 -0000
@@ -50,7 +50,7 @@ struct _HulaAccountInfo {
typedef struct _HulaAccountInfo HulaAccountInfo;
#define HULA_CALDAV_URI_PREFIX "caldav://"
-#define HULA_PREFIX_LENGTH 9
+#define HULA_CALDAV_PREFIX_LENGTH 9
#define HULA_URI_PREFIX "hula://"
#define HULA_PREFIX_LENGTH 7
#define PARENT_TYPE G_TYPE_OBJECT
@@ -130,6 +130,16 @@ is_hula_account (EAccount *account)
}
}
+static gboolean
+is_hula_caldav_account (EAccount *account)
+{
+ if (account->source->url != NULL) {
+ return (strncmp (account->source->url, HULA_CALDAV_URI_PREFIX, HULA_CALDAV_PREFIX_LENGTH ) == 0);
+ } else {
+ return FALSE;
+ }
+}
+
/* looks up for an existing hula account info in the hula_accounts list based on uid */
static HulaAccountInfo*
@@ -170,7 +180,7 @@ add_esource (const char *conf_key, const
char *source_selection_key;
char *relative_uri;
const char *cal_port = "8081";
- const char *use_ssl = "";
+ /* const char *use_ssl = ""; */
/* offline_sync to come soon */
/* TODO use_ssl = camel_url_get_param (url, "use_ssl"); */
@@ -293,7 +303,7 @@ remove_esource (const char *conf_key, co
}
-/* looks up for e-source with having same info as old_account_info and changes its values passed in new values */
+/* looks for e-source with the same info as old_account_info and changes its values to the values passed in */
static void
modify_esource (const char* conf_key, HulaAccountInfo *old_account_info, const char* new_group_name, CamelURL *new_url)
@@ -307,18 +317,13 @@ modify_esource (const char* conf_key, Hu
CamelURL *url;
gboolean found_group;
GConfClient* client;
- const char *address;
- const char *cal_port;
char *new_relative_uri;
- const char *new_address;
url = camel_url_new (old_account_info->source_url, NULL);
- address = url->host;
- if (!address || strlen (address) ==0)
+ if (!url->host || strlen (url->host) ==0)
return;
- new_address = new_url->host;
-
- old_relative_uri = g_strdup_printf ("%s %s:%s/dav/%s/calendar/Personal", url->user, url->host, cal_port, url->user);
+
+ old_relative_uri = g_strdup_printf ("%s %s:%d/dav/%s/calendar/Personal", url->user, url->host, url->port, url->user);
client = gconf_client_get_default ();
list = e_source_list_new_for_gconf (client, conf_key);
groups = e_source_list_peek_groups (list);
@@ -340,7 +345,7 @@ modify_esource (const char* conf_key, Hu
if (strcmp (e_source_peek_relative_uri (source), old_relative_uri) == 0) {
- new_relative_uri = g_strdup_printf ("%s %s:%s/dav/%s/calendar/Personal", url->user, url->host, cal_port, url->user);
+ new_relative_uri = g_strdup_printf ("%s %s:%d/dav/%s/calendar/Personal", new_url->user, new_url->host, new_url->port, new_url->user);
e_source_group_set_name (group, new_group_name);
e_source_set_relative_uri (source, new_relative_uri);
e_source_set_property (source, "username", new_url->user);
@@ -414,7 +419,7 @@ account_added (EAccountList *account_lis
EAccount *parent;
CamelURL *parent_url;
- if (!is_hula_account (account))
+ if (!is_hula_account (account) || !is_hula_caldav_account (account))
return;
info = g_new0 (HulaAccountInfo, 1);
@@ -439,7 +444,7 @@ account_removed (EAccountList *account_l
{
HulaAccountInfo *info;
- if (!is_hula_account (account))
+ if (!is_hula_account (account) || !is_hula_caldav_account (account))
return;
info = lookup_account_info (account->uid);
@@ -466,6 +471,8 @@ account_changed (EAccountList *account_l
const char *old_address, *new_address;
is_hula = is_hula_account (account);
+ if (is_hula == FALSE)
+ is_hula = is_hula_caldav_account (account);
existing_account_info = lookup_account_info (account->uid);
@@ -474,12 +481,12 @@ account_changed (EAccountList *account_l
if (!account->enabled)
return;
- /* some account of other type is changed to hula*/
+ /* some account of other type is changed to hula */
account_added (account_listener, account);
- } else if ( existing_account_info != NULL && !is_hula) {
+ } else if (existing_account_info != NULL && !is_hula) {
- /*hula account is changed to some other type */
+ /* hula account is changed to some other type */
remove_calendar_sources (existing_account_info);
hula_accounts = g_list_remove (hula_accounts, existing_account_info);
g_free (existing_account_info->uid);
@@ -494,7 +501,7 @@ account_changed (EAccountList *account_l
return;
}
- /* some info of hula account is changed . update the sources with new info if required */
+ /* some info of hula account is changed. update the sources with new info if required */
old_url = camel_url_new (existing_account_info->source_url, NULL);
old_address = old_url->host;
old_caldav_port = camel_url_get_param (old_url, "caldav_port");
Index: itip-formatter/itip-formatter.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/itip-formatter/itip-formatter.c,v
retrieving revision 1.54
diff -u -p -r1.54 itip-formatter.c
--- itip-formatter/itip-formatter.c 7 Nov 2005 08:56:21 -0000 1.54
+++ itip-formatter/itip-formatter.c 10 Dec 2005 21:16:31 -0000
@@ -447,6 +447,7 @@ find_cal_opened_cb (ECal *ecal, ECalenda
if ((pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST)
&& !pitip->current_ecal) {
+ /* Reuse already declared one or rename? */
ESource *source = NULL;
char *uid;
@@ -682,6 +683,7 @@ message_foreach_part (CamelMimePart *par
if (CAMEL_IS_MULTIPART (containee)) {
parts = camel_multipart_get_number (CAMEL_MULTIPART (containee));
for (i = 0; go && i < parts; i++) {
+ /* Reuse already declared *parts? */
CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (containee), i);
message_foreach_part (part, part_list);
@@ -964,6 +966,7 @@ update_attendee_status (FormatItipPObjec
itip_strip_mailto (a->delfrom),
itip_strip_mailto (a->value), NULL);
if (response == GTK_RESPONSE_YES) {
+ /* Already declared in this function */
icalproperty *prop = find_attendee (icalcomp, itip_strip_mailto (a->value));
icalcomponent_add_property (icalcomp,icalproperty_new_clone (prop));
e_cal_component_rescan (comp);
@@ -992,6 +995,7 @@ update_attendee_status (FormatItipPObjec
goto cleanup;
} else {
if (a->status == ICAL_PARTSTAT_DELEGATED) {
+ /* *prop already declared in this function */
icalproperty *prop, *new_prop;
prop = find_attendee (icalcomp, itip_strip_mailto (a->value));
@@ -1413,9 +1417,7 @@ view_response_cb (GtkWidget *widget, Iti
if (itip_view_get_rsvp (ITIP_VIEW (pitip->view)) && status) {
ECalComponent *comp = NULL;
- ECalComponentVType vtype;
icalcomponent *ical_comp;
- icalproperty *prop;
icalvalue *value;
const char *attendee, *comment;
GSList *l, *list = NULL;
@@ -1425,8 +1427,6 @@ view_response_cb (GtkWidget *widget, Iti
if (comp == NULL)
return;
- vtype = e_cal_component_get_vtype (comp);
-
if (pitip->my_address == NULL)
find_my_address (pitip, pitip->ical_comp, NULL);
g_assert (pitip->my_address != NULL);
@@ -1504,7 +1504,6 @@ check_is_instance (icalcomponent *icalco
x_name = icalproperty_get_x_name (icalprop);
if (!strcmp (x_name, "X-GW-RECURRENCE-KEY")) {
return TRUE;
- break;
}
icalprop = icalcomponent_get_next_property (icalcomp, ICAL_X_PROPERTY);
}
@@ -1776,6 +1775,7 @@ format_itip_object (EMFormatHTML *efh, G
CamelFolder *folder;
CamelURL *url;
char *uri;
+ /* *l is already declared in this function */
GSList *groups, *l;
ESource *source = NULL;
gboolean found = FALSE;
Index: itip-formatter/itip-view.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/itip-formatter/itip-view.c,v
retrieving revision 1.19
diff -u -p -r1.19 itip-view.c
--- itip-formatter/itip-view.c 24 Nov 2005 14:28:38 -0000 1.19
+++ itip-formatter/itip-view.c 10 Dec 2005 21:16:31 -0000
@@ -49,7 +49,7 @@
#define MEETING_ICON "stock_new-meeting"
-G_DEFINE_TYPE (ItipView, itip_view, GTK_TYPE_HBOX);
+G_DEFINE_TYPE (ItipView, itip_view, GTK_TYPE_HBOX)
typedef struct {
ItipViewInfoItemType type;
@@ -774,10 +774,8 @@ itip_view_destroy (GtkObject *object)
static void
itip_view_class_init (ItipViewClass *klass)
{
- GObjectClass *object_class;
GtkObjectClass *gtkobject_class;
- object_class = G_OBJECT_CLASS (klass);
gtkobject_class = GTK_OBJECT_CLASS (klass);
gtkobject_class->destroy = itip_view_destroy;
@@ -821,11 +819,9 @@ recur_toggled_cb (GtkWidget *widget, gpo
{
ItipView *view = data;
ItipViewPrivate *priv;
- gboolean is_recur;
priv = view->priv;
- is_recur = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->recur_check));
itip_view_set_mode (view, priv->mode);
}
@@ -1447,7 +1443,6 @@ itip_view_add_upper_info_item (ItipView
guint
itip_view_add_upper_info_item_printf (ItipView *view, ItipViewInfoItemType type, const char *format, ...)
{
- ItipViewPrivate *priv;
va_list args;
char *message;
guint id;
@@ -1455,8 +1450,6 @@ itip_view_add_upper_info_item_printf (It
g_return_val_if_fail (view != NULL, 0);
g_return_val_if_fail (ITIP_IS_VIEW (view), 0);
- priv = view->priv;
-
va_start (args, format);
message = g_strdup_vprintf (format, args);
va_end (args);
@@ -1545,7 +1538,6 @@ itip_view_add_lower_info_item (ItipView
guint
itip_view_add_lower_info_item_printf (ItipView *view, ItipViewInfoItemType type, const char *format, ...)
{
- ItipViewPrivate *priv;
va_list args;
char *message;
guint id;
@@ -1553,8 +1545,6 @@ itip_view_add_lower_info_item_printf (It
g_return_val_if_fail (view != NULL, 0);
g_return_val_if_fail (ITIP_IS_VIEW (view), 0);
- priv = view->priv;
-
va_start (args, format);
message = g_strdup_vprintf (format, args);
va_end (args);
Index: plugin-manager/plugin-manager.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/plugin-manager/plugin-manager.c,v
retrieving revision 1.2
diff -u -p -r1.2 plugin-manager.c
--- plugin-manager/plugin-manager.c 4 Aug 2005 04:32:43 -0000 1.2
+++ plugin-manager/plugin-manager.c 10 Dec 2005 21:16:31 -0000
@@ -132,13 +132,11 @@ eppm_selection_changed(GtkTreeSelection
static void
eppm_enable_toggled(GtkCellRendererToggle *renderer, char *arg1, Manager *m)
{
- GtkTreeSelection *selection;
GtkTreePath *path;
GtkTreeIter iter;
EPlugin *plugin;
path = gtk_tree_path_new_from_string(arg1);
- selection = gtk_tree_view_get_selection(m->tree);
if (gtk_tree_model_get_iter((GtkTreeModel *)m->model, &iter, path)) {
gtk_tree_model_get((GtkTreeModel *)m->model, &iter, 2, &plugin, -1);
e_plugin_enable(plugin, !plugin->enabled);
Index: sa-junk-plugin/em-junk-filter.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/sa-junk-plugin/em-junk-filter.c,v
retrieving revision 1.6
diff -u -p -r1.6 em-junk-filter.c
--- sa-junk-plugin/em-junk-filter.c 6 Oct 2005 11:19:39 -0000 1.6
+++ sa-junk-plugin/em-junk-filter.c 10 Dec 2005 21:16:31 -0000
@@ -322,7 +322,6 @@ em_junk_sa_run_spamd (char *binary)
d(fprintf (stderr, "trying to run %s with socket path %s\n", binary, em_junk_sa_get_socket_path ()));
if (!pipe_to_sa_full (NULL, NULL, argv, -1, 0, NULL)) {
- int i;
struct timespec time_req;
struct stat stat_buf;
Index: save-calendar/csv-format.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/save-calendar/csv-format.c,v
retrieving revision 1.12
diff -u -p -r1.12 csv-format.c
--- save-calendar/csv-format.c 16 May 2005 06:21:48 -0000 1.12
+++ save-calendar/csv-format.c 10 Dec 2005 21:16:31 -0000
@@ -229,15 +229,15 @@ string_needsquotes (const char *value, C
if (!needquotes) {
gint len = strlen (config->delimiter);
- if ((len == 2) && (config->delimiter[1] = ' ')) {
+ if ((len == 2) && (config->delimiter[1] == ' ')) {
needquotes = strchr (value, config->delimiter[0])?TRUE:FALSE;
if (!needquotes) {
- gint len = strlen (config->newline);
- if ((len == 2) && (config->newline[1] = ' ')) {
+ len = strlen (config->newline);
+ if ((len == 2) && (config->newline[1] == ' ')) {
needquotes = strchr (value, config->newline[0])?TRUE:FALSE;
if (!needquotes) {
- gint len = strlen (config->quote);
- if ((len == 2) && (config->quote[1] = ' ')) {
+ len = strlen (config->quote);
+ if ((len == 2) && (config->quote[1] == ' ')) {
needquotes = strchr
(value, config->quote[0])?TRUE:FALSE;
}
Index: save-calendar/save-calendar.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/save-calendar/save-calendar.c,v
retrieving revision 1.9
diff -u -p -r1.9 save-calendar.c
--- save-calendar/save-calendar.c 11 Nov 2005 09:08:25 -0000 1.9
+++ save-calendar/save-calendar.c 10 Dec 2005 21:16:31 -0000
@@ -139,8 +139,7 @@ ask_destination_and_save (EPlugin *ep, E
renderer, "text", DEST_NAME_COLUMN, NULL);
while (format_handlers) {
- FormatHandler *handler = format_handlers->data;
-
+ handler = format_handlers->data;
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, DEST_NAME_COLUMN,
handler->combo_label, -1);
Index: startup-wizard/startup-wizard.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/startup-wizard/startup-wizard.c,v
retrieving revision 1.4
diff -u -p -r1.4 startup-wizard.c
--- startup-wizard/startup-wizard.c 13 Jul 2005 05:47:39 -0000 1.4
+++ startup-wizard/startup-wizard.c 10 Dec 2005 21:16:31 -0000
@@ -147,6 +147,7 @@ startup_wizard_importer_page (EPlugin *e
for (l = import_importers; l; l = l->next) {
EImportImporter *eii = l->data;
char *str;
+ /* *label already declared */
GtkWidget *w, *label;
w = e_import_get_widget(import, (EImportTarget *)import_target, eii);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]