← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/gimp/jaunty-security

« back to all changes in this revision

Viewing changes to app/menus/plug-in-menus.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Holbach
  • Date: 2007-05-02 16:33:03 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20070502163303-bvzhjzbpw8qglc4y
Tags: 2.3.16-1ubuntu1
* Resynchronized with Debian, remaining Ubuntu changes:
  - debian/rules: i18n magic.
* debian/control.in:
  - Maintainer: Ubuntu Core Developers <ubuntu-devel@lists.ubuntu.com>
* debian/patches/02_help-message.patch,
  debian/patches/03_gimp.desktop.in.in.patch,
  debian/patches/10_dont_show_wizard.patch: updated.
* debian/patches/04_composite-signedness.patch,
  debian/patches/05_add-letter-spacing.patch: dropped, used upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/menus/plug-in-menus.c
1
 
/* The GIMP -- an image manipulation program
 
1
/* GIMP - The GNU Image Manipulation Program
2
2
 * Copyright (C) 1995 Spencer Kimball and Peter Mattis
3
3
 *
4
4
 * This program is free software; you can redistribute it and/or modify
18
18
 
19
19
#include "config.h"
20
20
 
21
 
#include "string.h"
 
21
#include <string.h>
22
22
 
23
23
#include <gtk/gtk.h>
24
24
 
26
26
 
27
27
#include "menus-types.h"
28
28
 
 
29
#include "config/gimpcoreconfig.h"
 
30
 
29
31
#include "core/gimp.h"
30
32
 
31
 
#include "plug-in/plug-ins.h"
32
 
#include "plug-in/plug-in-def.h"
33
 
#include "plug-in/plug-in-proc-def.h"
 
33
#include "plug-in/gimppluginmanager.h"
 
34
#include "plug-in/gimppluginmanager-locale-domain.h"
 
35
#include "plug-in/gimppluginprocedure.h"
34
36
 
35
37
#include "widgets/gimpuimanager.h"
36
38
 
43
45
 
44
46
struct _PlugInMenuEntry
45
47
{
46
 
  PlugInProcDef *proc_def;
47
 
  const gchar   *menu_path;
 
48
  GimpPlugInProcedure *proc;
 
49
  const gchar         *menu_path;
48
50
};
49
51
 
50
52
 
51
53
/*  local function prototypes  */
52
54
 
53
 
static gboolean   plug_in_menus_tree_traverse (gpointer         key,
54
 
                                               PlugInMenuEntry *entry,
55
 
                                               GimpUIManager   *manager);
56
 
static gchar    * plug_in_menus_build_path    (GimpUIManager   *manager,
57
 
                                               const gchar     *ui_path,
58
 
                                               guint            merge_id,
59
 
                                               const gchar     *menu_path,
60
 
                                               gboolean         for_menu);
 
55
static void    plug_in_menus_register_procedure   (GimpPDB             *pdb,
 
56
                                                   GimpProcedure       *procedure,
 
57
                                                   GimpUIManager       *manager);
 
58
static void    plug_in_menus_unregister_procedure (GimpPDB             *pdb,
 
59
                                                   GimpProcedure       *procedure,
 
60
                                                   GimpUIManager       *manager);
 
61
static void    plug_in_menus_menu_path_added      (GimpPlugInProcedure *plug_in_proc,
 
62
                                                   const gchar         *menu_path,
 
63
                                                   GimpUIManager       *manager);
 
64
static void    plug_in_menus_add_proc             (GimpUIManager       *manager,
 
65
                                                   const gchar         *ui_path,
 
66
                                                   GimpPlugInProcedure *proc,
 
67
                                                   const gchar         *menu_path);
 
68
static void       plug_in_menus_tree_insert       (GTree               *entries,
 
69
                                                   const gchar     *    path,
 
70
                                                   PlugInMenuEntry     *entry);
 
71
static gboolean   plug_in_menus_tree_traverse     (gpointer             key,
 
72
                                                   PlugInMenuEntry     *entry,
 
73
                                                   GimpUIManager       *manager);
 
74
static gchar * plug_in_menus_build_path           (GimpUIManager       *manager,
 
75
                                                   const gchar         *ui_path,
 
76
                                                   guint                merge_id,
 
77
                                                   const gchar         *menu_path,
 
78
                                                   gboolean             for_menu);
61
79
 
62
80
 
63
81
/*  public functions  */
64
82
 
65
83
void
66
 
plug_in_menus_init (Gimp        *gimp,
67
 
                    GSList      *plug_in_defs,
68
 
                    const gchar *std_plugins_domain)
69
 
{
70
 
  GSList *domains = NULL;
71
 
  GSList *tmp;
72
 
 
73
 
  g_return_if_fail (std_plugins_domain != NULL);
74
 
 
75
 
  domains = g_slist_append (domains, (gpointer) std_plugins_domain);
76
 
 
77
 
  bindtextdomain (std_plugins_domain, gimp_locale_directory ());
78
 
#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
79
 
  bind_textdomain_codeset (std_plugins_domain, "UTF-8");
80
 
#endif
81
 
 
82
 
  for (tmp = plug_in_defs; tmp; tmp = g_slist_next (tmp))
83
 
    {
84
 
      PlugInDef   *plug_in_def;
85
 
      const gchar *locale_domain;
86
 
      const gchar *locale_path;
87
 
      GSList      *list;
88
 
 
89
 
      plug_in_def = (PlugInDef *) tmp->data;
90
 
 
91
 
      if (! plug_in_def->proc_defs)
92
 
        continue;
93
 
 
94
 
      locale_domain = plug_ins_locale_domain (gimp,
95
 
                                              plug_in_def->prog,
96
 
                                              &locale_path);
97
 
 
98
 
      for (list = domains; list; list = list->next)
99
 
        if (! strcmp (locale_domain, (const gchar *) list->data))
100
 
          break;
101
 
 
102
 
      if (! list)
103
 
        {
104
 
          domains = g_slist_append (domains, (gpointer) locale_domain);
105
 
 
106
 
          bindtextdomain (locale_domain, locale_path);
107
 
#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
108
 
          bind_textdomain_codeset (locale_domain, "UTF-8");
109
 
#endif
110
 
        }
111
 
    }
112
 
 
113
 
  g_slist_free (domains);
114
 
}
115
 
 
116
 
void
117
84
plug_in_menus_setup (GimpUIManager *manager,
118
85
                     const gchar   *ui_path)
119
86
{
120
 
  GTree  *menu_entries;
121
 
  GSList *list;
 
87
  GimpPlugInManager *plug_in_manager;
 
88
  GTree             *menu_entries;
 
89
  GSList            *list;
 
90
  guint              merge_id;
 
91
  gint               i;
122
92
 
123
93
  g_return_if_fail (GIMP_IS_UI_MANAGER (manager));
124
94
  g_return_if_fail (ui_path != NULL);
125
95
 
 
96
  plug_in_manager = manager->gimp->plug_in_manager;
 
97
 
 
98
  merge_id = gtk_ui_manager_new_merge_id (GTK_UI_MANAGER (manager));
 
99
 
 
100
  for (i = 0; i < manager->gimp->config->plug_in_history_size; i++)
 
101
    {
 
102
      gchar *action_name;
 
103
      gchar *action_path;
 
104
 
 
105
      action_name = g_strdup_printf ("plug-in-recent-%02d", i + 1);
 
106
      action_path = g_strdup_printf ("%s/Filters/Recently Used/Plug-Ins",
 
107
                                     ui_path);
 
108
 
 
109
      gtk_ui_manager_add_ui (GTK_UI_MANAGER (manager), merge_id,
 
110
                             action_path, action_name, action_name,
 
111
                             GTK_UI_MANAGER_MENUITEM,
 
112
                             FALSE);
 
113
 
 
114
      g_free (action_name);
 
115
      g_free (action_path);
 
116
    }
 
117
 
126
118
  menu_entries = g_tree_new_full ((GCompareDataFunc) strcmp, NULL,
127
119
                                  g_free, g_free);
128
120
 
129
 
  for (list = manager->gimp->plug_in_proc_defs;
 
121
  for (list = plug_in_manager->plug_in_procedures;
130
122
       list;
131
123
       list = g_slist_next (list))
132
124
    {
133
 
      PlugInProcDef *proc_def = list->data;
134
 
 
135
 
      if (proc_def->prog         &&
136
 
          proc_def->menu_paths   &&
137
 
          ! proc_def->extensions &&
138
 
          ! proc_def->prefixes   &&
139
 
          ! proc_def->magics)
 
125
      GimpPlugInProcedure *plug_in_proc = list->data;
 
126
 
 
127
      if (! plug_in_proc->prog)
 
128
        continue;
 
129
 
 
130
      g_signal_connect_object (plug_in_proc, "menu-path-added",
 
131
                               G_CALLBACK (plug_in_menus_menu_path_added),
 
132
                               manager, 0);
 
133
 
 
134
      if (plug_in_proc->menu_paths &&
 
135
          ! plug_in_proc->file_proc)
140
136
        {
141
137
          GList *path;
142
138
 
143
 
          for (path = proc_def->menu_paths; path; path = g_list_next (path))
 
139
          for (path = plug_in_proc->menu_paths; path; path = g_list_next (path))
144
140
            {
145
 
              if ((! strncmp (path->data, "<Toolbox>", 9) &&
146
 
                   ! strcmp (ui_path, "/toolbox-menubar")) ||
147
 
                  (! strncmp (path->data, "<Image>", 7) &&
148
 
                   (! strcmp (ui_path, "/image-menubar") ||
149
 
                    ! strcmp (ui_path, "/dummy-menubar/image-popup"))))
 
141
              if (g_str_has_prefix (path->data, manager->name))
150
142
                {
151
143
                  PlugInMenuEntry *entry = g_new0 (PlugInMenuEntry, 1);
152
144
                  const gchar     *progname;
153
145
                  const gchar     *locale_domain;
154
 
                  gchar           *key;
155
146
 
156
 
                  entry->proc_def  = proc_def;
 
147
                  entry->proc      = plug_in_proc;
157
148
                  entry->menu_path = path->data;
158
149
 
159
 
                  progname = plug_in_proc_def_get_progname (proc_def);
160
 
 
161
 
                  locale_domain = plug_ins_locale_domain (manager->gimp,
162
 
                                                          progname, NULL);
163
 
 
164
 
                  if (proc_def->menu_label)
 
150
                  progname = gimp_plug_in_procedure_get_progname (plug_in_proc);
 
151
 
 
152
                  locale_domain =
 
153
                    gimp_plug_in_manager_get_locale_domain (plug_in_manager,
 
154
                                                            progname, NULL);
 
155
 
 
156
                  if (plug_in_proc->menu_label)
165
157
                    {
166
158
                      gchar *menu;
167
 
                      gchar *strip;
168
159
 
169
160
                      menu = g_strconcat (dgettext (locale_domain,
170
161
                                                    path->data),
171
162
                                          "/",
172
163
                                          dgettext (locale_domain,
173
 
                                                    proc_def->menu_label),
 
164
                                                    plug_in_proc->menu_label),
174
165
                                          NULL);
175
166
 
176
 
                      strip = gimp_strip_uline (menu);
177
 
 
178
 
                      key = g_utf8_collate_key (strip, -1);
179
 
 
180
 
                      g_free (strip);
 
167
                      plug_in_menus_tree_insert (menu_entries, menu, entry);
181
168
                      g_free (menu);
182
169
                    }
183
170
                  else
184
171
                    {
185
 
                      gchar *strip = gimp_strip_uline (dgettext (locale_domain,
186
 
                                                                 path->data));
187
 
 
188
 
                      key = g_utf8_collate_key (strip, -1);
189
 
 
190
 
                      g_free (strip);
 
172
                      plug_in_menus_tree_insert (menu_entries,
 
173
                                                 dgettext (locale_domain,
 
174
                                                           path->data),
 
175
                                                 entry);
191
176
                    }
192
 
 
193
 
                  g_tree_insert (menu_entries, key, entry);
194
177
                }
195
178
            }
196
179
        }
205
188
  g_object_set_data (G_OBJECT (manager), "ui-path", NULL);
206
189
 
207
190
  g_tree_destroy (menu_entries);
208
 
}
209
 
 
210
 
void
211
 
plug_in_menus_add_proc (GimpUIManager *manager,
212
 
                        const gchar   *ui_path,
213
 
                        PlugInProcDef *proc_def,
214
 
                        const gchar   *menu_path)
 
191
 
 
192
  g_signal_connect_object (manager->gimp->pdb, "register-procedure",
 
193
                           G_CALLBACK (plug_in_menus_register_procedure),
 
194
                           manager, 0);
 
195
  g_signal_connect_object (manager->gimp->pdb, "unregister-procedure",
 
196
                           G_CALLBACK (plug_in_menus_unregister_procedure),
 
197
                           manager, 0);
 
198
}
 
199
 
 
200
 
 
201
/*  private functions  */
 
202
 
 
203
static void
 
204
plug_in_menus_register_procedure (GimpPDB       *pdb,
 
205
                                  GimpProcedure *procedure,
 
206
                                  GimpUIManager *manager)
 
207
{
 
208
  if (GIMP_IS_PLUG_IN_PROCEDURE (procedure))
 
209
    {
 
210
      GimpPlugInProcedure *plug_in_proc = GIMP_PLUG_IN_PROCEDURE (procedure);
 
211
 
 
212
      g_signal_connect_object (plug_in_proc, "menu-path-added",
 
213
                               G_CALLBACK (plug_in_menus_menu_path_added),
 
214
                               manager, 0);
 
215
 
 
216
      if ((plug_in_proc->menu_label || plug_in_proc->menu_paths) &&
 
217
          ! plug_in_proc->file_proc)
 
218
        {
 
219
          GList *list;
 
220
 
 
221
#if 0
 
222
          g_print ("%s: %s\n", G_STRFUNC,
 
223
                   gimp_object_get_name (GIMP_OBJECT (procedure)));
 
224
#endif
 
225
 
 
226
          for (list = plug_in_proc->menu_paths; list; list = g_list_next (list))
 
227
            plug_in_menus_menu_path_added (plug_in_proc, list->data, manager);
 
228
        }
 
229
    }
 
230
}
 
231
 
 
232
static void
 
233
plug_in_menus_unregister_procedure (GimpPDB       *pdb,
 
234
                                    GimpProcedure *procedure,
 
235
                                    GimpUIManager *manager)
 
236
{
 
237
  if (GIMP_IS_PLUG_IN_PROCEDURE (procedure))
 
238
    {
 
239
      GimpPlugInProcedure *plug_in_proc = GIMP_PLUG_IN_PROCEDURE (procedure);
 
240
 
 
241
      g_signal_handlers_disconnect_by_func (plug_in_proc,
 
242
                                            plug_in_menus_menu_path_added,
 
243
                                            manager);
 
244
 
 
245
      if ((plug_in_proc->menu_label || plug_in_proc->menu_paths) &&
 
246
          ! plug_in_proc->file_proc)
 
247
        {
 
248
          GList *list;
 
249
 
 
250
#if 0
 
251
          g_print ("%s: %s\n", G_STRFUNC,
 
252
                   gimp_object_get_name (GIMP_OBJECT (procedure)));
 
253
#endif
 
254
 
 
255
          for (list = plug_in_proc->menu_paths; list; list = g_list_next (list))
 
256
            {
 
257
              if (g_str_has_prefix (list->data, manager->name))
 
258
                {
 
259
                  gchar *merge_key;
 
260
                  guint  merge_id;
 
261
 
 
262
                  merge_key = g_strdup_printf ("%s-merge-id",
 
263
                                               GIMP_OBJECT (plug_in_proc)->name);
 
264
                  merge_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (manager),
 
265
                                                                  merge_key));
 
266
                  g_free (merge_key);
 
267
 
 
268
                  if (merge_id)
 
269
                    gtk_ui_manager_remove_ui (GTK_UI_MANAGER (manager),
 
270
                                              merge_id);
 
271
 
 
272
                  break;
 
273
                }
 
274
            }
 
275
        }
 
276
    }
 
277
}
 
278
 
 
279
static void
 
280
plug_in_menus_menu_path_added (GimpPlugInProcedure *plug_in_proc,
 
281
                               const gchar         *menu_path,
 
282
                               GimpUIManager       *manager)
 
283
{
 
284
#if 0
 
285
  g_print ("%s: %s (%s)\n", G_STRFUNC,
 
286
           gimp_object_get_name (GIMP_OBJECT (plug_in_proc)), menu_path);
 
287
#endif
 
288
 
 
289
  if (g_str_has_prefix (menu_path, manager->name))
 
290
    {
 
291
      if (! strcmp (manager->name, "<Image>"))
 
292
        {
 
293
          plug_in_menus_add_proc (manager, "/image-menubar",
 
294
                                  plug_in_proc, menu_path);
 
295
          plug_in_menus_add_proc (manager, "/dummy-menubar/image-popup",
 
296
                                  plug_in_proc, menu_path);
 
297
        }
 
298
      else if (! strcmp (manager->name, "<Toolbox>"))
 
299
        {
 
300
          plug_in_menus_add_proc (manager, "/toolbox-menubar",
 
301
                                  plug_in_proc, menu_path);
 
302
        }
 
303
      else if (! strcmp (manager->name, "<Layers>"))
 
304
        {
 
305
          plug_in_menus_add_proc (manager, "/layers-popup",
 
306
                                  plug_in_proc, menu_path);
 
307
        }
 
308
      else if (! strcmp (manager->name, "<Channels>"))
 
309
        {
 
310
          plug_in_menus_add_proc (manager, "/channels-popup",
 
311
                                  plug_in_proc, menu_path);
 
312
        }
 
313
      else if (! strcmp (manager->name, "<Vectors>"))
 
314
        {
 
315
          plug_in_menus_add_proc (manager, "/vectors-popup",
 
316
                                  plug_in_proc, menu_path);
 
317
        }
 
318
      else if (! strcmp (manager->name, "<Colormap>"))
 
319
        {
 
320
          plug_in_menus_add_proc (manager, "/colormap-popup",
 
321
                                  plug_in_proc, menu_path);
 
322
        }
 
323
      else if (! strcmp (manager->name, "<Brushes>"))
 
324
        {
 
325
          plug_in_menus_add_proc (manager, "/brushes-popup",
 
326
                                  plug_in_proc, menu_path);
 
327
        }
 
328
      else if (! strcmp (manager->name, "<Gradients>"))
 
329
        {
 
330
          plug_in_menus_add_proc (manager, "/gradients-popup",
 
331
                                  plug_in_proc, menu_path);
 
332
        }
 
333
      else if (! strcmp (manager->name, "<Palettes>"))
 
334
        {
 
335
          plug_in_menus_add_proc (manager, "/palettes-popup",
 
336
                                  plug_in_proc, menu_path);
 
337
        }
 
338
      else if (! strcmp (manager->name, "<Patterns>"))
 
339
        {
 
340
          plug_in_menus_add_proc (manager, "/patterns-popup",
 
341
                                  plug_in_proc, menu_path);
 
342
        }
 
343
      else if (! strcmp (manager->name, "<Fonts>"))
 
344
        {
 
345
          plug_in_menus_add_proc (manager, "/fonts-popup",
 
346
                                  plug_in_proc, menu_path);
 
347
        }
 
348
      else if (! strcmp (manager->name, "<Buffers>"))
 
349
        {
 
350
          plug_in_menus_add_proc (manager, "/buffers-popup",
 
351
                                  plug_in_proc, menu_path);
 
352
        }
 
353
    }
 
354
}
 
355
 
 
356
static void
 
357
plug_in_menus_add_proc (GimpUIManager       *manager,
 
358
                        const gchar         *ui_path,
 
359
                        GimpPlugInProcedure *proc,
 
360
                        const gchar         *menu_path)
215
361
{
216
362
  gchar *path;
217
363
  gchar *merge_key;
 
364
  gchar *stripped_path;
218
365
  gchar *action_path;
219
366
  guint  merge_id;
220
367
  guint  menu_merge_id;
221
368
 
222
369
  g_return_if_fail (GIMP_IS_UI_MANAGER (manager));
223
370
  g_return_if_fail (ui_path != NULL);
224
 
  g_return_if_fail (proc_def != NULL);
 
371
  g_return_if_fail (GIMP_IS_PLUG_IN_PROCEDURE (proc));
225
372
 
226
373
  path = g_strdup (menu_path);
227
374
 
228
 
  if (! proc_def->menu_label)
 
375
  if (! proc->menu_label)
229
376
    {
230
 
      gchar *p = strrchr (path, '/');
231
 
 
 
377
      gchar *p;
 
378
 
 
379
      if (! path)
 
380
        return;
 
381
 
 
382
      p = strrchr (path, '/');
232
383
      if (! p)
233
384
        {
234
385
          g_free (path);
238
389
      *p = '\0';
239
390
    }
240
391
 
241
 
  merge_key = g_strdup_printf ("%s-merge-id", proc_def->db_info.name);
 
392
  merge_key = g_strdup_printf ("%s-merge-id", GIMP_OBJECT (proc)->name);
242
393
 
243
394
  merge_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (manager),
244
395
                                                  merge_key));
262
413
                         GUINT_TO_POINTER (menu_merge_id));
263
414
    }
264
415
 
 
416
  stripped_path = gimp_strip_uline (path);
265
417
  action_path = plug_in_menus_build_path (manager, ui_path, menu_merge_id,
266
 
                                          path, FALSE);
 
418
                                          stripped_path, FALSE);
 
419
  g_free (stripped_path);
267
420
 
268
421
  if (! action_path)
269
422
    {
273
426
 
274
427
#if 0
275
428
  g_print ("adding menu item for '%s' (@ %s)\n",
276
 
           proc_def->db_info.name, action_path);
 
429
           GIMP_OBJECT (proc)->name, action_path);
277
430
#endif
278
431
 
279
432
  gtk_ui_manager_add_ui (GTK_UI_MANAGER (manager), merge_id,
280
433
                         action_path,
281
 
                         proc_def->db_info.name,
282
 
                         proc_def->db_info.name,
 
434
                         GIMP_OBJECT (proc)->name,
 
435
                         GIMP_OBJECT (proc)->name,
283
436
                         GTK_UI_MANAGER_MENUITEM,
284
437
                         FALSE);
285
438
 
287
440
  g_free (path);
288
441
}
289
442
 
290
 
void
291
 
plug_in_menus_remove_proc (GimpUIManager *manager,
292
 
                           PlugInProcDef *proc_def)
 
443
static void
 
444
plug_in_menus_tree_insert (GTree           *entries,
 
445
                           const gchar     *path,
 
446
                           PlugInMenuEntry *entry)
293
447
{
294
 
  gchar *merge_key;
295
 
  guint  merge_id;
296
 
 
297
 
  g_return_if_fail (GIMP_IS_UI_MANAGER (manager));
298
 
  g_return_if_fail (proc_def != NULL);
299
 
 
300
 
  merge_key = g_strdup_printf ("%s-merge-id", proc_def->db_info.name);
301
 
  merge_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (manager),
302
 
                                                  merge_key));
303
 
  g_free (merge_key);
304
 
 
305
 
  if (merge_id)
306
 
    gtk_ui_manager_remove_ui (GTK_UI_MANAGER (manager), merge_id);
 
448
  gchar *strip = gimp_strip_uline (path);
 
449
  gchar *key;
 
450
 
 
451
  /* Append the procedure name to the menu path in order to get a unique
 
452
   * key even if two procedures are installed to the same menu entry.
 
453
   */
 
454
  key = g_strconcat (strip,
 
455
                     gimp_object_get_name (GIMP_OBJECT (entry->proc)),
 
456
                     NULL);
 
457
 
 
458
  g_tree_insert (entries, g_utf8_collate_key (key, -1), entry);
 
459
 
 
460
  g_free (key);
 
461
  g_free (strip);
307
462
}
308
463
 
309
 
 
310
 
/*  private functions  */
311
 
 
312
464
static gboolean
313
465
plug_in_menus_tree_traverse (gpointer         key,
314
466
                             PlugInMenuEntry *entry,
316
468
{
317
469
  const gchar *ui_path = g_object_get_data (G_OBJECT (manager), "ui-path");
318
470
 
319
 
  plug_in_menus_add_proc (manager, ui_path, entry->proc_def, entry->menu_path);
 
471
  plug_in_menus_add_proc (manager, ui_path, entry->proc, entry->menu_path);
320
472
 
321
473
  return FALSE;
322
474
}
340
492
 
341
493
  if (! gtk_ui_manager_get_widget (GTK_UI_MANAGER (manager), action_path))
342
494
    {
343
 
      gchar *parent_menu_path = g_strdup (menu_path);
 
495
      gchar *parent_menu_path   = g_strdup (menu_path);
 
496
      gchar *parent_action_path = NULL;
344
497
      gchar *menu_item_name;
345
 
      gchar *parent_action_path;
346
498
 
347
499
      menu_item_name = strrchr (parent_menu_path, '/');
348
500
      *menu_item_name++ = '\0';
349
501
 
350
 
      parent_action_path = plug_in_menus_build_path (manager, ui_path, merge_id,
351
 
                                                     parent_menu_path, TRUE);
 
502
      if (menu_item_name)
 
503
        parent_action_path = plug_in_menus_build_path (manager,
 
504
                                                       ui_path, merge_id,
 
505
                                                       parent_menu_path, TRUE);
352
506
 
353
507
      if (parent_action_path)
354
508
        {
395
549
 
396
550
  if (action_path && for_menu)
397
551
    {
398
 
      gchar *placeholder_path = g_strdup_printf ("%s/%s",
399
 
                                                 action_path, "Menus");
 
552
      gchar *placeholder_path = g_strdup_printf ("%s/%s", action_path, "Menus");
400
553
 
401
554
      if (gtk_ui_manager_get_widget (GTK_UI_MANAGER (manager),
402
555
                                     placeholder_path))