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

peek the primary selection.

Browse Source 
2003-11-17  Rodrigo Moya <rodrigo@ximian.com>

	* gui/calendar-component.c (delete_calendar_cb, rename_calendar_cb):
	* gui/tasks-component.c (delete_task_list_cb, rename_task_list_cb):
	peek the primary selection.

svn path=/trunk/; revision=23392
This commit is contained in:
Rodrigo Moya
2003-11-17 16:24:35 +00:00
committed by Rodrigo Moya
parent d731705f50
commit 708935e0da
3 changed files with 51 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/ChangeLog
View File

@ -1,3 +1,9 @@
2003-11-17 Rodrigo Moya <rodrigo@ximian.com>
* gui/calendar-component.c (delete_calendar_cb, rename_calendar_cb):
* gui/tasks-component.c (delete_task_list_cb, rename_task_list_cb):
peek the primary selection.
2003-11-17 Rodrigo Moya <rodrigo@ximian.com> 2003-11-17 Rodrigo Moya <rodrigo@ximian.com>
* gui/tasks-component.c (fill_popup_menu_cb): added 'Delete' and * gui/tasks-component.c (fill_popup_menu_cb): added 'Delete' and

23
calendar/gui/calendar-component.c
View File

@ -257,19 +257,16 @@ add_popup_menu_item (GtkMenu *menu, const char *label, const char *pixmap,
static void static void
delete_calendar_cb (GtkWidget *widget, CalendarComponent *comp) delete_calendar_cb (GtkWidget *widget, CalendarComponent *comp)
{ {
GSList *selection, *l; ESource *selected_source;
CalendarComponentPrivate *priv; CalendarComponentPrivate *priv;
GtkWidget *dialog;
priv = comp->priv; priv = comp->priv;
selection = e_source_selector_get_selection (E_SOURCE_SELECTOR (priv->source_selector)); selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->source_selector));
if (!selection) if (!selected_source)
return; return;
for (l = selection; l; l = l->next) {
GtkWidget *dialog;
ESource *selected_source = l->data;
/* create the confirmation dialog */ /* create the confirmation dialog */
dialog = gtk_message_dialog_new ( dialog = gtk_message_dialog_new (
GTK_WINDOW (gtk_widget_get_toplevel (widget)), GTK_WINDOW (gtk_widget_get_toplevel (widget)),
@ -292,9 +289,6 @@ delete_calendar_cb (GtkWidget *widget, CalendarComponent *comp)
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
} }
e_source_selector_free_selection (selection);
}
static void static void
new_calendar_cb (GtkWidget *widget, CalendarComponent *comp) new_calendar_cb (GtkWidget *widget, CalendarComponent *comp)
{ {
@ -304,19 +298,16 @@ new_calendar_cb (GtkWidget *widget, CalendarComponent *comp)
static void static void
rename_calendar_cb (GtkWidget *widget, CalendarComponent *comp) rename_calendar_cb (GtkWidget *widget, CalendarComponent *comp)
{ {
GSList *selection;
CalendarComponentPrivate *priv; CalendarComponentPrivate *priv;
ESource *selected_source; ESource *selected_source;
GtkWidget *dialog, *entry; GtkWidget *dialog, *entry;
priv = comp->priv; priv = comp->priv;
selection = e_source_selector_get_selection (E_SOURCE_SELECTOR (priv->source_selector)); selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->source_selector));
if (!selection) if (!selected_source)
return; return;
selected_source = selection->data;
/* create the dialog to prompt the user for the new name */ /* create the dialog to prompt the user for the new name */
dialog = gtk_message_dialog_new (gtk_widget_get_toplevel (widget), dialog = gtk_message_dialog_new (gtk_widget_get_toplevel (widget),
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
@ -332,8 +323,6 @@ rename_calendar_cb (GtkWidget *widget, CalendarComponent *comp)
e_source_set_name (selected_source, gtk_entry_get_text (GTK_ENTRY (entry))); e_source_set_name (selected_source, gtk_entry_get_text (GTK_ENTRY (entry)));
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
e_source_selector_free_selection (selection);
} }
static void static void

23
calendar/gui/tasks-component.c
View File

@ -228,19 +228,16 @@ add_popup_menu_item (GtkMenu *menu, const char *label, const char *pixmap,
static void static void
delete_task_list_cb (GtkWidget *widget, TasksComponent *comp) delete_task_list_cb (GtkWidget *widget, TasksComponent *comp)
{ {
GSList *selection, *l; ESource *selected_source;
TasksComponentPrivate *priv; TasksComponentPrivate *priv;
GtkWidget *dialog;
priv = comp->priv; priv = comp->priv;
selection = e_source_selector_get_selection (E_SOURCE_SELECTOR (priv->source_selector)); selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->source_selector));
if (!selection) if (!selected_source)
return; return;
for (l = selection; l; l = l->next) {
GtkWidget *dialog;
ESource *selected_source = l->data;
/* create the confirmation dialog */ /* create the confirmation dialog */
dialog = gtk_message_dialog_new ( dialog = gtk_message_dialog_new (
GTK_WINDOW (gtk_widget_get_toplevel (widget)), GTK_WINDOW (gtk_widget_get_toplevel (widget)),
@ -263,9 +260,6 @@ delete_task_list_cb (GtkWidget *widget, TasksComponent *comp)
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
} }
e_source_selector_free_selection (selection);
}
static void static void
new_task_list_cb (GtkWidget *widget, TasksComponent *component) new_task_list_cb (GtkWidget *widget, TasksComponent *component)
{ {
@ -274,19 +268,16 @@ new_task_list_cb (GtkWidget *widget, TasksComponent *component)
static void static void
rename_task_list_cb (GtkWidget *widget, TasksComponent *comp) rename_task_list_cb (GtkWidget *widget, TasksComponent *comp)
{ {
GSList *selection;
TasksComponentPrivate *priv; TasksComponentPrivate *priv;
ESource *selected_source; ESource *selected_source;
GtkWidget *dialog, *entry; GtkWidget *dialog, *entry;
priv = comp->priv; priv = comp->priv;
selection = e_source_selector_get_selection (E_SOURCE_SELECTOR (priv->source_selector)); selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->source_selector));
if (!selection) if (!selected_source)
return; return;
selected_source = selection->data;
/* create the dialog to prompt the user for the new name */ /* create the dialog to prompt the user for the new name */
dialog = gtk_message_dialog_new (gtk_widget_get_toplevel (widget), dialog = gtk_message_dialog_new (gtk_widget_get_toplevel (widget),
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
@ -302,8 +293,6 @@ rename_task_list_cb (GtkWidget *widget, TasksComponent *comp)
e_source_set_name (selected_source, gtk_entry_get_text (GTK_ENTRY (entry))); e_source_set_name (selected_source, gtk_entry_get_text (GTK_ENTRY (entry)));
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
e_source_selector_free_selection (selection);
} }
static void static void