aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorJason Leach <jleach@ximian.com>2001-08-14 01:59:52 +0800
committerJacob Leach <jleach@src.gnome.org>2001-08-14 01:59:52 +0800
commit2c27394b7f6f688842128428e1fc4a1327a4df29 (patch)
treed1b5b6dd269d67710cf209c864f4c0cb1739330b /shell
parent96bdbb506f8184b23ebfe02ffac837de1462eadf (diff)
downloadgsoc2013-evolution-2c27394b7f6f688842128428e1fc4a1327a4df29.tar.gz
gsoc2013-evolution-2c27394b7f6f688842128428e1fc4a1327a4df29.tar.zst
gsoc2013-evolution-2c27394b7f6f688842128428e1fc4a1327a4df29.zip
Remove unused variable @folder.
2001-08-13 Jason Leach <jleach@ximian.com> * e-local-storage.c (remove_folder_directory): Remove unused variable @folder. * e-shell-folder-commands.c (e_shell_command_add_to_shortcut_bar): Give icons to shortcuts added via Right-click->Add to Shortcut Bar. svn path=/trunk/; revision=11944
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog9
-rw-r--r--shell/e-local-storage.c2
-rw-r--r--shell/e-shell-folder-commands.c7
3 files changed, 15 insertions, 3 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 48095961a6..548859d095 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,12 @@
+2001-08-13 Jason Leach <jleach@ximian.com>
+
+ * e-local-storage.c (remove_folder_directory): Remove unused
+ variable @folder.
+
+ * e-shell-folder-commands.c (e_shell_command_add_to_shortcut_bar):
+ Give icons to shortcuts added via Right-click->Add to Shortcut
+ Bar.
+
2001-08-12 Ettore Perazzoli <ettore@ximian.com>
* e-shell-folder-selection-dialog.c
diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c
index 8c23c8659e..566980a175 100644
--- a/shell/e-local-storage.c
+++ b/shell/e-local-storage.c
@@ -450,7 +450,6 @@ remove_folder_directory (ELocalStorage *local_storage,
{
EStorage *storage;
ELocalStoragePrivate *priv;
- EFolder *folder;
const char *folder_name;
char *file_name;
char *physical_path;
@@ -458,7 +457,6 @@ remove_folder_directory (ELocalStorage *local_storage,
priv = local_storage->priv;
storage = E_STORAGE (local_storage);
- folder = e_storage_get_folder (storage, path);
folder_name = g_basename (path);
/* Delete the metadata file associated with this folder. */
diff --git a/shell/e-shell-folder-commands.c b/shell/e-shell-folder-commands.c
index 5eed7fcc3e..afc775a5ab 100644
--- a/shell/e-shell-folder-commands.c
+++ b/shell/e-shell-folder-commands.c
@@ -565,6 +565,8 @@ e_shell_command_add_to_shortcut_bar (EShell *shell,
EShellView *shell_view)
{
EShortcuts *shortcuts;
+ EStorageSet *storage_set;
+ EFolder *folder;
int group_num;
const char *uri;
int unread_count;
@@ -580,5 +582,8 @@ e_shell_command_add_to_shortcut_bar (EShell *shell,
unread_count = get_folder_unread (shell, e_shell_view_get_current_path (shell_view));
- e_shortcuts_add_shortcut (shortcuts, group_num, -1, uri, NULL, unread_count, NULL);
+ storage_set = e_shell_get_storage_set (shell);
+ folder = e_storage_set_get_folder (storage_set, e_shell_view_get_current_path (shell_view));
+
+ e_shortcuts_add_shortcut (shortcuts, group_num, -1, uri, NULL, unread_count, e_folder_get_type_string (folder));
}
src.gnome.org> 2000-05-25 13:55:59 +0800 committer Ettore Perazzoli <ettore@src.gnome.org> 2000-05-25 13:55:59 +0800 Reorganized the shell to allow dynamic registration of storages and' href='/~lantw44/cgit/gsoc2013-evolution/commit/calendar/gui/calendar-component.c?h=GTOP_1_0_10&id=bb241192eb773d7f0d178306dd55f9ca8e31c1f0'>bb241192eb
7f36752a67
bb241192eb

7f36752a67

bb241192eb

ff224ac819

7f36752a67


ff224ac819

bb241192eb
7f36752a67


bb241192eb

d35b129e06

bb241192eb

322c0cad70


d35b129e06
1febeef6be
322c0cad70
d35b129e06




322c0cad70
bb241192eb
d35b129e06


bb241192eb










782d8a198c
bb241192eb


d35b129e06

bb241192eb



25c8b24168
1febeef6be











25c8b24168
1febeef6be
bb241192eb



1febeef6be
bb241192eb



25c8b24168


bb241192eb

1febeef6be
25c8b24168
1febeef6be

25c8b24168
bb241192eb
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148






















                                                                           
                   
                   
                                      
                                 
                                                                             
      
                              
                            
                            
                              
                             
      
 
 
                                                                                                                               
                                                                                                                                         

                                            
                                                    
                    








                                                                 
                                    

                                                      

                                            

                           

                               


                                                                 

                                                                                
 


                                            

 

                            

                                                       


                                                 
 
                                                     
                                




                                                         
                                   
 


                                










                                                 
                                                                                                            


                                                                      

                                                                        



                                               
                                 











                                                                                 
      
 



                             
                                               



                                                                                      


                                                                                            

                                                                              
 
                                 

                                                                                      
      
 
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* component-factory.c
 *
 * Copyright (C) 2000  Helix Code, Inc.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation; either version 2 of the
 * License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public
 * License along with this program; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
 *
 * Author: Ettore Perazzoli
 */

#include <config.h>
#include <bonobo.h>
#include "evolution-shell-component.h"
#ifdef WANT_THE_EXECUTIVE_SUMMARY
#include <executive-summary/evolution-services/executive-summary-component.h>
#endif
#include "component-factory.h"
#include "control-factory.h"
#include "calendar-config.h"
#if WANT_THE_EXECUTIVE_SUMMARY
#include "calendar-summary.h"
#endif


#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"
#define SUMMARY_FACTORY_ID "OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"

static BonoboGenericFactory *factory = NULL;
static BonoboGenericFactory *summary_factory = NULL;
char *evolution_dir;

static const EvolutionShellComponentFolderType folder_types[] = {
    { "calendar", "evolution-calendar.png" },
    { NULL, NULL }
};


/* EvolutionShellComponent methods and signals.  */

static EvolutionShellComponentResult
create_view (EvolutionShellComponent *shell_component,
         const char *physical_uri,
         const char *type,
         BonoboControl **control_return,
         void *closure)
{
    BonoboControl *control;

    if (g_strcasecmp (type, "calendar") != 0)
        return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;

    control = control_factory_new_control ();
    bonobo_control_set_property (control, "folder_uri", physical_uri, NULL);

    *control_return = control;

    return EVOLUTION_SHELL_COMPONENT_OK;
}

static gint owner_count = 0;

static void
owner_set_cb (EvolutionShellComponent *shell_component,
          EvolutionShellClient *shell_client,
          const char *evolution_homedir,
          gpointer user_data)
{
    evolution_dir = g_strdup (evolution_homedir);
    calendar_config_init ();
    owner_count ++;
}

static void
owner_unset_cb (EvolutionShellComponent *shell_component,
        gpointer user_data)
{
    owner_count --;
    if (owner_count <= 0)
        gtk_main_quit();
}


/* The factory function.  */

static BonoboObject *
factory_fn (BonoboGenericFactory *factory,
        void *closure)
{
    EvolutionShellComponent *shell_component;

    shell_component = evolution_shell_component_new (folder_types, create_view, NULL, NULL, NULL, NULL);

    gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
                GTK_SIGNAL_FUNC (owner_set_cb), NULL);
    gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
                GTK_SIGNAL_FUNC (owner_unset_cb), NULL);

    return BONOBO_OBJECT (shell_component);
}

#ifdef WANT_THE_EXECUTIVE_SUMMARY
static BonoboObject *
summary_fn (BonoboGenericFactory *factory, 
        void *closure)
{
    ExecutiveSummaryComponent *summary_component;

    summary_component = executive_summary_component_new (NULL,
                                 create_summary_view,
                                 NULL,
                                 evolution_dir);
    return BONOBO_OBJECT (summary_component);
}
#endif


void
component_factory_init (void)
{
    if (factory != NULL && factory != NULL)
        return;

    factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL);

#ifdef WANT_THE_EXECUTIVE_SUMMARY
    summary_factory = bonobo_generic_factory_new (SUMMARY_FACTORY_ID, summary_fn, NULL);
#endif
    if (factory == NULL)
        g_error ("Cannot initialize Evolution's calendar component.");

#ifdef WANT_THE_EXECUTIVE_SUMMARY
    if (summary_factory == NULL)
        g_error ("Cannot initialize Evolution's calendar summary component.");
#endif
}