Mercurial > pidgin
comparison src/gtkprivacy.c @ 7165:a230b7bca1fb
[gaim-migrate @ 7732]
Fix a memleak of a GaimGtkPrivacyDialogThing when you use the close
button, and also make the destroy and close callbacks match the
behavior of the account dialog closer.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 05 Oct 2003 22:15:25 +0000 |
| parents | b89d98f0bf79 |
| children | 2a781d4178ba |
comparison
equal
deleted
inserted
replaced
| 7164:7fadcbdcac29 | 7165:a230b7bca1fb |
|---|---|
| 219 } | 219 } |
| 220 | 220 |
| 221 static gint | 221 static gint |
| 222 destroy_cb(GtkWidget *w, GdkEvent *event, GaimGtkPrivacyDialog *dialog) | 222 destroy_cb(GtkWidget *w, GdkEvent *event, GaimGtkPrivacyDialog *dialog) |
| 223 { | 223 { |
| 224 g_free(dialog); | 224 gaim_gtk_privacy_dialog_hide(); |
| 225 | |
| 226 privacy_dialog = NULL; | |
| 227 | 225 |
| 228 return 0; | 226 return 0; |
| 229 } | 227 } |
| 230 | 228 |
| 231 static void | 229 static void |
| 323 clear_cb(GtkWidget *button, GaimGtkPrivacyDialog *dialog) | 321 clear_cb(GtkWidget *button, GaimGtkPrivacyDialog *dialog) |
| 324 { | 322 { |
| 325 } | 323 } |
| 326 | 324 |
| 327 static void | 325 static void |
| 328 close_cb(GtkWidget *button, void *user_data) | 326 close_cb(GtkWidget *button, GaimGtkPrivacyDialog *dialog) |
| 329 { | 327 { |
| 328 gtk_widget_destroy(dialog->win); | |
| 329 | |
| 330 gaim_gtk_privacy_dialog_hide(); | 330 gaim_gtk_privacy_dialog_hide(); |
| 331 } | 331 } |
| 332 | 332 |
| 333 static gboolean | 333 static gboolean |
| 334 check_account_func(GaimAccount *account) | 334 check_account_func(GaimAccount *account) |
| 512 gaim_gtk_privacy_dialog_hide(void) | 512 gaim_gtk_privacy_dialog_hide(void) |
| 513 { | 513 { |
| 514 if (privacy_dialog == NULL) | 514 if (privacy_dialog == NULL) |
| 515 return; | 515 return; |
| 516 | 516 |
| 517 gtk_widget_destroy(privacy_dialog->win); | 517 g_free(privacy_dialog); |
| 518 privacy_dialog = NULL; | 518 privacy_dialog = NULL; |
| 519 } | 519 } |
| 520 | 520 |
| 521 static void | 521 static void |
| 522 destroy_request_data(GaimGtkPrivacyRequestData *data) | 522 destroy_request_data(GaimGtkPrivacyRequestData *data) |