diff options
| -rw-r--r-- | shell/ChangeLog | 11 | ||||
| -rw-r--r-- | shell/e-shortcuts-view.c | 33 | ||||
| -rw-r--r-- | shell/evolution-shell-component.c | 2 |
3 files changed, 14 insertions, 32 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 4a7ea0a64c..9ca8bd0ca9 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,16 @@ 2001-08-09 Ettore Perazzoli <ettore@ximian.com> + * e-shortcuts-view.c (show_new_group_dialog): Cast the toplevel to + be passed to `e_request_string()' to GtkWindow, not GtkWidget. + Also, remove unused variables. + (get_efolder_from_shortcut): Constify @item_url. + (get_storage_set_path_from_uri): Removed. + + * evolution-shell-component.c (destroy): `p' shall be a GList, not + a GSList. + +2001-08-09 Ettore Perazzoli <ettore@ximian.com> + * e-shell-view.c (e_shell_view_construct): Add the menu items using the EShellUserCreatableItemsHandler. diff --git a/shell/e-shortcuts-view.c b/shell/e-shortcuts-view.c index 53a83ff243..da007e339f 100644 --- a/shell/e-shortcuts-view.c +++ b/shell/e-shortcuts-view.c @@ -63,41 +63,12 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; -/* FIXME this should all be in the model. */ - -static const char * -get_storage_set_path_from_uri (const char *uri) -{ - const char *colon; - - if (g_path_is_absolute (uri)) - return NULL; - - colon = strchr (uri, ':'); - if (colon == NULL || colon == uri || colon[1] == '\0') - return NULL; - - if (! g_path_is_absolute (colon + 1)) - return NULL; - - if (g_strncasecmp (uri, "evolution", colon - uri) != 0) - return NULL; - - return colon + 1; -} - - static void show_new_group_dialog (EShortcutsView *view) { - GtkWidget *dialog; - GtkWidget *label; - GtkWidget *entry; - GtkWidget *box; char *group_name; - int button_num; - group_name = e_request_string (GTK_WIDGET (gtk_widget_get_toplevel (GTK_WIDGET (view))), + group_name = e_request_string (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))), _("Create new shortcut group"), _("Group name:"), NULL); @@ -499,7 +470,7 @@ item_selected (EShortcutBar *shortcut_bar, static EFolder * get_efolder_from_shortcut (EShortcuts *shortcuts, - char *item_url) + const char *item_url) { EFolderTypeRegistry *folder_type_registry; EStorageSet *storage_set; diff --git a/shell/evolution-shell-component.c b/shell/evolution-shell-component.c index 2ff908aa68..18b53da202 100644 --- a/shell/evolution-shell-component.c +++ b/shell/evolution-shell-component.c @@ -551,7 +551,7 @@ destroy (GtkObject *object) EvolutionShellComponent *shell_component; EvolutionShellComponentPrivate *priv; CORBA_Environment ev; - GSList *p; + GList *p; shell_component = EVOLUTION_SHELL_COMPONENT (object); |