+2002-07-23 [melvin] 0.8.0claws5
+
+ * src/addressbook.c
+ * src/addrgather.c
+ * src/editaddress.c
+ * src/editgroup.c
+ * src/editldap_basedn.c
+ * src/importldif.c
+ * src/prefs_common.c
+ Fixed few memory leak (gtk_editable_get_chars returns
+ an allocated string)
+ * src/logwindow.c
+ Fixed few memory leak (gtk_editable_get_chars returns
+ an allocated string) and modified a little the log cutting
+ loop.
+ * src/compose.c
+ Replaced a call to an obsolete function gtk_entry_get_text()
+ by gtk_editable_get_chars()
+ * src/send.c
+ Removed a debug printf
+
2002-07-23 [christoph] 0.8.0claws4
* src/filesel.c
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=claws4
+EXTRA_VERSION=claws5
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
dnl set $target
#endif
gchar *sLookup;
- sLookup = gtk_editable_get_chars( GTK_EDITABLE(addrbook.entry), 0, -1 );
- g_strchomp( sLookup );
-
if( ! addrbook.treeSelected ) return;
if( GTK_CTREE_ROW( addrbook.treeSelected )->level == 1 ) return;
obj = gtk_ctree_node_get_row_data( ctree, addrbook.treeSelected );
if( obj == NULL ) return;
+
+ sLookup = gtk_editable_get_chars( GTK_EDITABLE(addrbook.entry), 0, -1 );
+ g_strchomp( sLookup );
#ifdef USE_LDAP
if( obj->type == ADDR_DATASOURCE ) {
}
}
#endif
-
+ g_free( sLookup );
}
/* **********************************************************************
addrgather_dlg_status_show(
_( "Please select the mail headers to search." ) );
addrharvest_free( harvester );
+ g_free( name );
return FALSE;
}
for(list = compose->header_list; list; list = list->next) {
gchar *header;
gchar *entry;
- header = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(((ComposeHeaderEntry *)list->data)->combo)->entry));
+ header = gtk_editable_get_chars(GTK_EDITABLE(GTK_COMBO(((ComposeHeaderEntry *)list->data)->combo)->entry), 0, -1);
entry = gtk_editable_get_chars(GTK_EDITABLE(((ComposeHeaderEntry *)list->data)->entry), 0, -1);
g_strstrip(entry);
if(entry[0] != '\0') {
}
}
}
+ g_free(header);
g_free(entry);
}
return recipient_found;
sTitle = g_strdup( _title_edit_ );
}
else {
- sTitle = g_strdup_printf( "%s - %s", _title_edit_,
- gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_name), 0, -1 ) );
+ gchar *name;
+ name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_name), 0, -1 );
+ sTitle = g_strdup_printf( "%s - %s", _title_edit_, name );
+ g_free( name );
+
}
gtk_window_set_title( GTK_WINDOW(personeditdlg.window), sTitle );
g_free( sTitle );
static ItemEMail *edit_person_email_edit( gboolean *error, ItemEMail *email ) {
ItemEMail *retVal = NULL;
- gchar *sEmail, *sAlias, *sRemarks;
+ gchar *sEmail, *sAlias, *sRemarks, *tEmail;
*error = TRUE;
- sEmail = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_email), 0, -1 );
+ tEmail = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_email), 0, -1 );
sAlias = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_alias), 0, -1 );
sRemarks = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_remarks), 0, -1 );
- sEmail = mgu_email_check_empty( sEmail );
+ sEmail = mgu_email_check_empty( tEmail );
if( sEmail ) {
if( email == NULL ) {
email = addritem_create_item_email();
else {
edit_person_status_show( _( "An E-Mail address must be supplied." ) );
}
+ g_free( tEmail );
+ g_free( sEmail );
+ g_free( sAlias );
+ g_free( sRemarks );
return retVal;
}
static UserAttribute *edit_person_attrib_edit( gboolean *error, UserAttribute *attrib ) {
UserAttribute *retVal = NULL;
- gchar *sName, *sValue;
+ gchar *sName, *sValue, *tName, *tValue;
*error = TRUE;
- sName = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_atname), 0, -1 );
- sValue = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_atvalue), 0, -1 );
- sName = mgu_email_check_empty( sName );
- sValue = mgu_email_check_empty( sValue );
+ tName = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_atname), 0, -1 );
+ tValue = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_atvalue), 0, -1 );
+ sName = mgu_email_check_empty( tName );
+ sValue = mgu_email_check_empty( tValue );
if( sName && sValue ) {
if( attrib == NULL ) {
attrib = addritem_create_attribute();
else {
edit_person_status_show( _( "A Name and Value must be supplied." ) );
}
+ g_free( tName );
+ g_free( sName );
+ g_free( tValue );
+ g_free( sValue );
return retVal;
}
return NULL;
}
- cn = g_strdup( gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_name), 0, -1 ) );
+ cn = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_name), 0, -1 );
if( person ) {
/* Update email/attribute list */
addrbook_update_address_list( abf, person, listEMail );
if( ! cancelled ) {
/* Set person stuff */
+ gchar *name;
addritem_person_set_common_name( person, cn );
- addritem_person_set_first_name( person,
- gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_first), 0, -1 ) );
- addritem_person_set_last_name( person,
- gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_last), 0, -1 ) );
- addritem_person_set_nick_name( person,
- gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_nick), 0, -1 ) );
+ name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_first), 0, -1 );
+ addritem_person_set_first_name( person, name );
+ g_free( name );
+ name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_last), 0, -1 );
+ addritem_person_set_last_name( person, name );
+ g_free( name );
+ name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_nick), 0, -1 );
+ addritem_person_set_nick_name( person, name );
+ g_free( name );
}
g_free( cn );
}
static void edit_group_ok(GtkWidget *widget, gboolean *cancelled) {
- gchar *sName = g_strdup( gtk_editable_get_chars( GTK_EDITABLE(groupeditdlg.entry_name), 0, -1 ) );
+ gchar *sName = gtk_editable_get_chars( GTK_EDITABLE(groupeditdlg.entry_name), 0, -1 );
gboolean errFlag = TRUE;
if( sName ) {
g_strstrip( sName );
ItemGroup *addressbook_edit_group( AddressBookFile *abf, ItemFolder *parent, ItemGroup *group ) {
static gboolean cancelled;
GList *listEMail = NULL;
+ gchar *name;
if (!groupeditdlg.window)
addressbook_edit_group_create(&cancelled);
/* Create new person and email list */
group = addrbook_add_group_list( abf, parent, listEMail );
}
- addritem_group_set_name( group, gtk_editable_get_chars( GTK_EDITABLE(groupeditdlg.entry_name), 0, -1 ) );
-
+ name = gtk_editable_get_chars( GTK_EDITABLE(groupeditdlg.entry_name), 0, -1 );
+ addritem_group_set_name( group, name );
+ g_free( name );
listEMail = NULL;
return group;
}
if( ldapedit_basedn_cancelled ) return NULL;
if( ldapedit_basedn_bad_server ) return NULL;
- retVal = g_strdup( gtk_editable_get_chars( GTK_EDITABLE(ldapedit_basedn.basedn_entry), 0, -1 ) );
+ retVal = gtk_editable_get_chars( GTK_EDITABLE(ldapedit_basedn.basedn_entry), 0, -1 );
g_strchomp( retVal ); g_strchug( retVal );
if( *retVal == '\0' ) {
g_free( retVal );
rec = gtk_clist_get_row_data( clist, impldif_dlg.rowIndSelect );
g_free( rec->userName );
- rec->userName = g_strdup( gtk_editable_get_chars( GTK_EDITABLE(impldif_dlg.name_attrib), 0, -1 ) );
+ rec->userName = gtk_editable_get_chars( GTK_EDITABLE(impldif_dlg.name_attrib), 0, -1 );
rec->selected = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( impldif_dlg.check_select) );
imp_ldif_update_row( clist );
gtk_clist_select_row( clist, row, 0 );
static void imp_ldif_finish_show() {
gchar *recs;
gchar *sMsg;
+ gchar *name;
recs = g_strdup_printf( "%d", _ldifFile_->importCount );
- gtk_label_set_text( GTK_LABEL(impldif_dlg.labelBook),
- gtk_editable_get_chars( GTK_EDITABLE(impldif_dlg.name_entry), 0, -1 ) );
+
+ name = gtk_editable_get_chars( GTK_EDITABLE(impldif_dlg.name_entry), 0, -1 );
+ gtk_label_set_text( GTK_LABEL(impldif_dlg.labelBook), name );
+ g_free( name );
gtk_label_set_text( GTK_LABEL(impldif_dlg.labelFile), _ldifFile_->path );
gtk_label_set_text( GTK_LABEL(impldif_dlg.labelRecords), recs );
g_free( recs );
gtk_widget_hide(logwin->window);
}
+#define LOG_AVG_LINE_LEN 80
void log_window_clear(GtkWidget *text)
{
guint length;
debug_print(_("Log window length: %u\n"), length);
if (length > prefs_common.loglength) {
+ gchar *lf;
/* find the end of the first line after the cut off
* point */
point = length - prefs_common.loglength;
- gtk_text_set_point (GTK_TEXT (text), point);
- str = gtk_editable_get_chars (GTK_EDITABLE (text),
- point, point + 1);
+
+ do {
+ str = gtk_editable_get_chars (GTK_EDITABLE (text),
+ point, point + LOG_AVG_LINE_LEN);
+ if ((lf = strchr(str, '\n')) != NULL)
+ point += lf - str;
+ else
+ point += LOG_AVG_LINE_LEN;
+ g_free(str);
+ } while (lf == NULL);
+
gtk_text_freeze (GTK_TEXT (text));
- while(str && *str != '\n')
- str = gtk_editable_get_chars (GTK_EDITABLE (text),
- ++point, point + 2);
/* erase the text */
gtk_text_set_point (GTK_TEXT (text), 0);
if (text)
strftime(buffer, sizeof buffer, text, cal_time);
gtk_label_set_text(example, buffer);
+ g_free(text);
}
static void date_format_select_row(GtkWidget *date_format_list, gint row,
return -1;
}
- printf("account: %p\n", ac_prefs);
-
if (ac_prefs->use_mail_command && ac_prefs->mail_command &&
(*ac_prefs->mail_command)) {
val = send_message_local(ac_prefs->mail_command, fp);