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

No need to check for priv being NULL here anymore.

Browse Source 
* e-activity-handler.c (impl_operationStarted): No need to check
for priv being NULL here anymore.
(impl_operationProgressing): Likewise.
(impl_operationFinished): Likewise.
(impl_requestDialog): Likewise.

* evolution-folder-selector-button.c (clicked): Use
g_object_add_weak_pointer() on the parent_window instead of using
GTK_OBJECT_DESTROYED().

svn path=/trunk/; revision=18782
This commit is contained in:
Ettore Perazzoli
2002-11-15 19:29:03 +00:00
parent a79f61ba4c
commit 27d6e723fd
3 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
shell/ChangeLog
View File

@ -1,3 +1,15 @@
2002-11-15 Ettore Perazzoli <ettore@ximian.com>
* e-activity-handler.c (impl_operationStarted): No need to check
for priv being NULL here anymore.
(impl_operationProgressing): Likewise.
(impl_operationFinished): Likewise.
(impl_requestDialog): Likewise.
* evolution-folder-selector-button.c (clicked): Use
g_object_add_weak_pointer() on the parent_window instead of using
GTK_OBJECT_DESTROYED().
2002-11-15 Ettore Perazzoli <ettore@ximian.com>
* e-shell-startup-wizard.c (e_shell_startup_wizard_create): For

16
shell/e-activity-handler.c
View File

@ -388,10 +388,6 @@ impl_operationStarted (PortableServer_Servant servant,
activity_handler = E_ACTIVITY_HANDLER (bonobo_object_from_servant (servant));
/* FIXME */
if (/* GTK_OBJECT_DESTROYED (activity_handler) || */ activity_handler->priv == NULL)
return;
priv = activity_handler->priv;
if (icon->_length == 0) {
@ -439,10 +435,6 @@ impl_operationProgressing (PortableServer_Servant servant,
activity_handler = E_ACTIVITY_HANDLER (bonobo_object_from_servant (servant));
/* FIXME */
if (/* GTK_OBJECT_DESTROYED (activity_handler) || */ activity_handler->priv == NULL)
return;
priv = activity_handler->priv;
p = lookup_activity (priv->activity_infos, activity_id, &order_number);
@ -483,10 +475,6 @@ impl_operationFinished (PortableServer_Servant servant,
activity_handler = E_ACTIVITY_HANDLER (bonobo_object_from_servant (servant));
/* FIXME */
if (/* GTK_OBJECT_DESTROYED (activity_handler) || */ activity_handler->priv == NULL)
return;
priv = activity_handler->priv;
p = lookup_activity (priv->activity_infos, activity_id, &order_number);
@ -512,10 +500,6 @@ impl_requestDialog (PortableServer_Servant servant,
activity_handler = E_ACTIVITY_HANDLER (bonobo_object_from_servant (servant));
/* FIXME */
if (/* GTK_OBJECT_DESTROYED (activity_handler) || */ activity_handler->priv == NULL)
return GNOME_Evolution_Activity_DIALOG_ACTION_ERROR;
/* FIXME implement. */
g_warning ("Evolution::Activity::requestDialog not implemented");

10
shell/evolution-folder-selector-button.c
View File

@ -161,6 +161,8 @@ clicked (GtkButton *button)
g_signal_emit (folder_selector_button, signals[POPPED_UP], 0);
g_object_add_weak_pointer (G_OBJECT (parent_window), (void **) &parent_window);
evolution_shell_client_user_select_folder (priv->shell_client,
parent_window,
priv->title,
@ -168,17 +170,15 @@ clicked (GtkButton *button)
(const char **)priv->possible_types,
&return_folder);
#if 0 /* FIXME */
g_object_remove_weak_pointer (G_OBJECT (parent_window), (void **) &parent_window);
/* If the parent gets destroyed despite our best efforts (eg,
* because its own parent got destroyed), then the folder
* selector button will have been destroyed too and we need
* to just bail out here.
*/
if (GTK_OBJECT_DESTROYED (parent_window)) {
g_object_unref (parent_window);
if (parent_window == NULL)
return;
}
#endif
gtk_widget_set_sensitive (GTK_WIDGET (parent_window), TRUE);
g_object_unref (parent_window);