diff --git a/autogen.sh b/autogen.sh index 428ffbf..fe1d470 100755 --- a/autogen.sh +++ b/autogen.sh @@ -27,7 +27,11 @@ EOF # substitute revision and linguas linguas=`sed -e '/^#/d' po/LINGUAS` -revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'` +if test -d .git/svn; then + revision=`LC_ALL=C git-svn find-rev HEAD` +else + revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n",$2}'` +fi sed -e "s/@LINGUAS@/${linguas}/g" \ -e "s/@REVISION@/${revision}/g" \ < "configure.ac.in" > "configure.in" diff --git a/configure.ac.in b/configure.ac.in index 5afa6bc..7483340 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -170,6 +170,8 @@ AC_OUTPUT([ Makefile icons/Makefile icons/16x16/Makefile +icons/24x24/Makefile +icons/48x48/Makefile po/Makefile.in thunar-svn-plugin/Makefile tsp-svn-helper/Makefile diff --git a/icons/24x24/Makefile.am b/icons/24x24/Makefile.am new file mode 100644 index 0000000..0b67da7 --- /dev/null +++ b/icons/24x24/Makefile.am @@ -0,0 +1,7 @@ +iconsdir = $(datadir)/icons/hicolor/24x24/apps +icons_DATA = \ + subversion.png + +EXTRA_DIST = \ + $(icons_DATA) + diff --git a/icons/24x24/subversion.png b/icons/24x24/subversion.png new file mode 100644 index 0000000..0bf5be6 Binary files /dev/null and b/icons/24x24/subversion.png differ diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am new file mode 100644 index 0000000..795c901 --- /dev/null +++ b/icons/48x48/Makefile.am @@ -0,0 +1,7 @@ +iconsdir = $(datadir)/icons/hicolor/48x48/apps +icons_DATA = \ + subversion.png + +EXTRA_DIST = \ + $(icons_DATA) + diff --git a/icons/48x48/subversion.png b/icons/48x48/subversion.png new file mode 100644 index 0000000..e754fbd Binary files /dev/null and b/icons/48x48/subversion.png differ diff --git a/icons/Makefile.am b/icons/Makefile.am index b43804b..c043235 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -1,6 +1,8 @@ SUBDIRS = \ - 16x16 + 16x16 \ + 24x24 \ + 48x48 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor diff --git a/thunar-svn-plugin/tsp-provider.c b/thunar-svn-plugin/tsp-provider.c index 46aabc6..b568dd6 100644 --- a/thunar-svn-plugin/tsp-provider.c +++ b/thunar-svn-plugin/tsp-provider.c @@ -140,7 +140,25 @@ tsp_provider_property_page_provider_init (ThunarxPropertyPageProviderIface *ifac static void tsp_provider_init (TspProvider *tsp_provider) { - tsp_svn_backend_init(); +#if !GTK_CHECK_VERSION(2,9,0) + GtkIconSource *icon_source; + GtkIconSet *icon_set; + + /* setup our icon factory */ + tsp_provider->icon_factory = gtk_icon_factory_new (); + gtk_icon_factory_add_default (tsp_provider->icon_factory); + + /* add the "subversion" stock icon */ + icon_set = gtk_icon_set_new (); + icon_source = gtk_icon_source_new (); + gtk_icon_source_set_icon_name (icon_source, "subversion"); + gtk_icon_set_add_source (icon_set, icon_source); + gtk_icon_factory_add (tsp_provider->icon_factory, "subversion", icon_set); + gtk_icon_source_free (icon_source); + gtk_icon_set_unref (icon_set); +#endif /* !GTK_CHECK_VERSION(2,9,0) */ + + tsp_svn_backend_init(); } @@ -345,19 +363,19 @@ tsp_provider_get_file_actions (ThunarxMenuProvider *menu_provider, ThunarVfsPathScheme scheme; ThunarVfsInfo *info; gboolean parent_wc = FALSE; - gboolean directory_is_wc = FALSE; - gboolean directory_is_not_wc = FALSE; - gboolean file_is_vc = FALSE; - gboolean file_is_not_vc = FALSE; + gboolean directory_is_wc = FALSE; + gboolean directory_is_not_wc = FALSE; + gboolean file_is_vc = FALSE; + gboolean file_is_not_vc = FALSE; GtkAction *action; GtkAction *svnaction; GList *actions = NULL; GList *lp; gint n_files = 0; - GSList *file_status; - GSList *iter; + GSList *file_status; + GSList *iter; - file_status = tsp_get_parent_status (files->data); + file_status = tsp_get_parent_status (files->data); /* check all supplied files */ for (lp = files; lp != NULL; lp = lp->next, ++n_files) @@ -417,9 +435,14 @@ tsp_provider_get_file_actions (ThunarxMenuProvider *menu_provider, /* It's not a working copy * append the "Import" action */ action = g_object_new (GTK_TYPE_ACTION, - "name", "Tsp::import", - "label", _("SVN _Import"), - NULL); +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "gtk-network", +#else + "icon-name", "gtk-network", +#endif + "name", "Tsp::import", + "label", _("SVN _Import"), + NULL); g_signal_connect_object (action, "activate", G_CALLBACK (tsp_action_import), svnaction, G_CONNECT_AFTER); actions = g_list_append (actions, action); /* append the svn submenu action @@ -475,16 +498,26 @@ tsp_provider_get_folder_actions (ThunarxMenuProvider *menu_provider, /* It's not a working copy * append the "Checkout" action */ action = g_object_new (GTK_TYPE_ACTION, - "name", "Tsp::checkout", - "label", _("SVN _Checkout"), - NULL); +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "gtk-connect", +#else + "icon-name", "gtk-connect", +#endif + "name", "Tsp::checkout", + "label", _("SVN _Checkout"), + NULL); g_signal_connect_object (action, "activate", G_CALLBACK (tsp_action_checkout), svnaction, G_CONNECT_AFTER); actions = g_list_append (actions, action); /* append the "Export" action */ action = g_object_new (GTK_TYPE_ACTION, - "name", "Tsp::export", - "label", _("SVN _Export"), - NULL); +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "gtk-save", +#else + "icon-name", "gtk-save", +#endif + "name", "Tsp::export", + "label", _("SVN _Export"), + NULL); g_signal_connect_object (action, "activate", G_CALLBACK (tsp_action_export), svnaction, G_CONNECT_AFTER); actions = g_list_append (actions, action); /* append the svn submenu action diff --git a/thunar-svn-plugin/tsp-svn-action.c b/thunar-svn-plugin/tsp-svn-action.c index 399c955..ff539e4 100644 --- a/thunar-svn-plugin/tsp-svn-action.c +++ b/thunar-svn-plugin/tsp-svn-action.c @@ -78,33 +78,33 @@ static void tsp_svn_action_set_property (GObject*, guint, const GValue*, GParamS -void tsp_action_add (GtkMenuItem *item, TspSvnAction *action); +void tsp_action_add (GtkAction *item, TspSvnAction *tsp_action); -void tsp_action_cleanup (GtkMenuItem *item, TspSvnAction *action); +void tsp_action_cleanup (GtkAction *item, TspSvnAction *tsp_action); -void tsp_action_commit (GtkMenuItem *item, TspSvnAction *action); +void tsp_action_commit (GtkAction *item, TspSvnAction *tsp_action); -void tsp_action_copy (GtkMenuItem *item, TspSvnAction *action); +void tsp_action_copy (GtkAction *item, TspSvnAction *tsp_action); -void tsp_action_delete (GtkMenuItem *item, TspSvnAction *action); +void tsp_action_delete (GtkAction *item, TspSvnAction *tsp_action); -void tsp_action_lock (GtkMenuItem *item, TspSvnAction *action); +void tsp_action_lock (GtkAction *item, TspSvnAction *tsp_action); -void tsp_action_log (GtkMenuItem *item, TspSvnAction *action); +void tsp_action_log (GtkAction *item, TspSvnAction *tsp_action); -void tsp_action_move (GtkMenuItem *item, TspSvnAction *action); +void tsp_action_move (GtkAction *item, TspSvnAction *tsp_action); -void tsp_action_properties (GtkMenuItem *item, TspSvnAction *action); +void tsp_action_properties (GtkAction *item, TspSvnAction *tsp_action); -void tsp_action_resolved (GtkMenuItem *item, TspSvnAction *action); +void tsp_action_resolved (GtkAction *item, TspSvnAction *tsp_action); -void tsp_action_revert (GtkMenuItem *item, TspSvnAction *action); +void tsp_action_revert (GtkAction *item, TspSvnAction *tsp_action); -void tsp_action_status (GtkMenuItem *item, TspSvnAction *action); +void tsp_action_status (GtkAction *item, TspSvnAction *tsp_action); -void tsp_action_unlock (GtkMenuItem *item, TspSvnAction *action); +void tsp_action_unlock (GtkAction *item, TspSvnAction *tsp_action); -void tsp_action_update (GtkMenuItem *item, TspSvnAction *action); +void tsp_action_update (GtkAction *item, TspSvnAction *tsp_action); @@ -162,29 +162,34 @@ tsp_svn_action_init (TspSvnAction *self) GtkAction * tsp_svn_action_new (const gchar *name, const gchar *label, - GList *files, - GtkWidget *window, - gboolean is_parent, - gboolean parent_version_control, - gboolean directory_version_control, - gboolean directory_no_version_control, - gboolean file_version_control, - gboolean file_no_version_control) + GList *files, + GtkWidget *window, + gboolean is_parent, + gboolean parent_version_control, + gboolean directory_version_control, + gboolean directory_no_version_control, + gboolean file_version_control, + gboolean file_no_version_control) { g_return_val_if_fail(name, NULL); g_return_val_if_fail(label, NULL); GtkAction *action = g_object_new (TSP_TYPE_SVN_ACTION, - "hide-if-empty", FALSE, - "name", name, - "label", label, - "is-parent", is_parent, - "parent-version-control", parent_version_control, - "directory-version-control", directory_version_control, - "directory-no-version-control", directory_no_version_control, - "file-version-control", file_version_control, - "file-no-version-control", file_no_version_control, - NULL); + "hide-if-empty", FALSE, + "name", name, + "label", label, + "is-parent", is_parent, + "parent-version-control", parent_version_control, + "directory-version-control", directory_version_control, + "directory-no-version-control", directory_no_version_control, + "file-version-control", file_version_control, + "file-no-version-control", file_no_version_control, +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "subversion", +#else + "icon-name", "subversion", +#endif + NULL); TSP_SVN_ACTION (action)->files = thunarx_file_info_list_copy (files); // TSP_SVN_ACTION (action)->window = gtk_widget_ref (window); TSP_SVN_ACTION (action)->window = window; @@ -241,6 +246,7 @@ tsp_svn_action_create_menu_item (GtkAction *action) { GtkWidget *item; GtkWidget *menu; + GtkWidget *subaction; GtkWidget *subitem; TspSvnAction *tsp_action = TSP_SVN_ACTION (action); @@ -251,18 +257,28 @@ tsp_svn_action_create_menu_item (GtkAction *action) /* No version control */ if (!tsp_action->property.is_parent && tsp_action->property.parent_version_control && (tsp_action->property.directory_no_version_control || tsp_action->property.file_no_version_control)) { - subitem = gtk_menu_item_new_with_label (_("Add")); - g_signal_connect_object (subitem, "activate", G_CALLBACK (tsp_action_add), action, G_CONNECT_AFTER); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); - gtk_widget_show(subitem); + subaction = g_object_new (GTK_TYPE_ACTION, "name", "tsp::add", "label", _("Add"), +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "gtk-add", +#else + "icon-name", "gtk-add", +#endif + NULL); + g_signal_connect_after (subaction, "activate", G_CALLBACK (tsp_action_add), action); + + subitem = gtk_action_create_menu_item (GTK_ACTION (subaction)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); + gtk_widget_show(subitem); } /* Version control (file) */ if (tsp_action->property.file_version_control) { - subitem = gtk_menu_item_new_with_label (_("Blame")); - g_signal_connect_after (subitem, "activate", G_CALLBACK (tsp_action_unimplemented), "Blame"); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); - gtk_widget_show(subitem); + subaction = g_object_new (GTK_TYPE_ACTION, "name", "tsp::blame", "label", _("Blame"), NULL); + g_signal_connect_after (subaction, "activate", G_CALLBACK (tsp_action_unimplemented), _("Blame")); + + subitem = gtk_action_create_menu_item (GTK_ACTION (subaction)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); + gtk_widget_show(subitem); } /* No need subitem = gtk_menu_item_new_with_label (_("Cat")); @@ -277,50 +293,98 @@ tsp_svn_action_create_menu_item (GtkAction *action) *//* Version control (parent) */ if (tsp_action->property.is_parent && tsp_action->property.parent_version_control) { - subitem = gtk_menu_item_new_with_label (_("Cleanup")); - g_signal_connect_object (subitem, "activate", G_CALLBACK (tsp_action_cleanup), action, G_CONNECT_AFTER); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); - gtk_widget_show(subitem); + subaction = g_object_new (GTK_TYPE_ACTION, "name", "tsp::cleanup", "label", _("Cleanup"), +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "gtk-clear", +#else + "icon-name", "gtk-clear", +#endif + NULL); + g_signal_connect_after (subaction, "activate", G_CALLBACK (tsp_action_cleanup), action); + + subitem = gtk_action_create_menu_item (GTK_ACTION (subaction)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); + gtk_widget_show(subitem); } /* Version control (all) */ if ((tsp_action->property.is_parent && tsp_action->property.parent_version_control) || tsp_action->property.directory_version_control || tsp_action->property.file_version_control) { - subitem = gtk_menu_item_new_with_label (_("Commit")); - g_signal_connect_object (subitem, "activate", G_CALLBACK (tsp_action_commit), action, G_CONNECT_AFTER); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); - gtk_widget_show(subitem); + subaction = g_object_new (GTK_TYPE_ACTION, "name", "tsp::commit", "label", _("Commit"), +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "gtk-apply", +#else + "icon-name", "gtk-apply", +#endif + NULL); + g_signal_connect_after (subaction, "activate", G_CALLBACK (tsp_action_commit), action); + + subitem = gtk_action_create_menu_item (GTK_ACTION (subaction)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); + gtk_widget_show(subitem); } /* Version control (no parent) */ if (!tsp_action->property.is_parent && tsp_action->property.parent_version_control && (tsp_action->property.directory_version_control || tsp_action->property.file_version_control)) - { - subitem = gtk_menu_item_new_with_label (_("Copy")); - g_signal_connect_object (subitem, "activate", G_CALLBACK (tsp_action_copy), action, G_CONNECT_AFTER); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); - gtk_widget_show(subitem); - } + { + subaction = g_object_new (GTK_TYPE_ACTION, "name", "tsp::copy", "label", _("Copy"), +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "gtk-copy", +#else + "icon-name", "gtk-copy", +#endif + NULL); + g_signal_connect_after (subaction, "activate", G_CALLBACK (tsp_action_copy), action); + + subitem = gtk_action_create_menu_item (GTK_ACTION (subaction)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); + gtk_widget_show(subitem); + } /* Version control (no parent) */ if (!tsp_action->property.is_parent && tsp_action->property.parent_version_control && (tsp_action->property.directory_version_control || tsp_action->property.file_version_control)) { - subitem = gtk_menu_item_new_with_label (_("Delete")); - g_signal_connect_object (subitem, "activate", G_CALLBACK (tsp_action_delete), action, G_CONNECT_AFTER); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); - gtk_widget_show(subitem); + subaction = g_object_new (GTK_TYPE_ACTION, "name", "tsp::delete", "label", _("Delete"), +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "gtk-delete", +#else + "icon-name", "gtk-delete", +#endif + NULL); + g_signal_connect_after (subaction, "activate", G_CALLBACK (tsp_action_delete), action); + + subitem = gtk_action_create_menu_item (GTK_ACTION (subaction)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); + gtk_widget_show(subitem); } /* Version control (file) */ if (tsp_action->property.file_version_control) { - subitem = gtk_menu_item_new_with_label (_("Diff")); - g_signal_connect_after (subitem, "activate", G_CALLBACK (tsp_action_unimplemented), "Diff"); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); - gtk_widget_show(subitem); + subaction = g_object_new (GTK_TYPE_ACTION, "name", "tsp::diff", "label", _("Diff"), +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "gtk-find-and-replace", +#else + "icon-name", "gtk-find-and-replace", +#endif + NULL); + g_signal_connect_after (subaction, "activate", G_CALLBACK (tsp_action_unimplemented), _("Diff")); + + subitem = gtk_action_create_menu_item (GTK_ACTION (subaction)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); + gtk_widget_show(subitem); } /* Version control */ if ((tsp_action->property.is_parent && tsp_action->property.parent_version_control) || tsp_action->property.directory_version_control || tsp_action->property.file_version_control) { - subitem = gtk_menu_item_new_with_label (_("Export")); - g_signal_connect_object (subitem, "activate", G_CALLBACK (tsp_action_export), action, G_CONNECT_AFTER); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); - gtk_widget_show(subitem); + subaction = g_object_new (GTK_TYPE_ACTION, "name", "tsp::export", "label", _("Export"), +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "gtk-save", +#else + "icon-name", "gtk-save", +#endif + NULL); + g_signal_connect_after (subaction, "activate", G_CALLBACK (tsp_action_export), action); + + subitem = gtk_action_create_menu_item (GTK_ACTION (subaction)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); + gtk_widget_show(subitem); } /* Not here subitem = gtk_menu_item_new_with_label (_("Import")); @@ -330,10 +394,18 @@ tsp_svn_action_create_menu_item (GtkAction *action) *//* Version control (all) */ if ((tsp_action->property.is_parent && tsp_action->property.parent_version_control) || tsp_action->property.directory_version_control || tsp_action->property.file_version_control) { - subitem = gtk_menu_item_new_with_label (_("Info")); - g_signal_connect_after (subitem, "activate", G_CALLBACK (tsp_action_unimplemented), "Info"); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); - gtk_widget_show(subitem); + subaction = g_object_new (GTK_TYPE_ACTION, "name", "tsp::info", "label", _("Info"), +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "gtk-info", +#else + "icon-name", "gtk-info", +#endif + NULL); + g_signal_connect_after (subaction, "activate", G_CALLBACK (tsp_action_unimplemented), _("Info")); + + subitem = gtk_action_create_menu_item (GTK_ACTION (subaction)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); + gtk_widget_show(subitem); } /* Ehmm... subitem = gtk_menu_item_new_with_label (_("List")); @@ -343,18 +415,33 @@ tsp_svn_action_create_menu_item (GtkAction *action) *//* Version control (all) */ if ((tsp_action->property.is_parent && tsp_action->property.parent_version_control) || tsp_action->property.directory_version_control || tsp_action->property.file_version_control) { - subitem = gtk_menu_item_new_with_label (_("Lock")); - g_signal_connect_object (subitem, "activate", G_CALLBACK (tsp_action_lock), action, G_CONNECT_AFTER); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); - gtk_widget_show(subitem); + subaction = g_object_new (GTK_TYPE_ACTION, "name", "tsp::lock", "label", _("Lock"), +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", GTK_STOCK_DIALOG_AUTHENTICATION, +#else + "icon-name", GTK_STOCK_DIALOG_AUTHENTICATION, +#endif + NULL); + g_signal_connect_after (subaction, "activate", G_CALLBACK (tsp_action_lock), action); + + subitem = gtk_action_create_menu_item (GTK_ACTION (subaction)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); + gtk_widget_show(subitem); } /* Version control (all) */ if ((tsp_action->property.is_parent && tsp_action->property.parent_version_control) || tsp_action->property.directory_version_control || tsp_action->property.file_version_control) { - subitem = gtk_menu_item_new_with_label (_("Log")); - g_signal_connect_object (subitem, "activate", G_CALLBACK (tsp_action_log), action, G_CONNECT_AFTER); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); - gtk_widget_show(subitem); + subaction = g_object_new (GTK_TYPE_ACTION, "name", "tsp::log", "label", _("Log"), +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "gtk-index", +#else + "icon-name", "gtk-index", +#endif + NULL); + g_signal_connect_after (subaction, "activate", G_CALLBACK (tsp_action_log), action); + + subitem = gtk_action_create_menu_item (GTK_ACTION (subaction)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); } /* Ehmm ... subitem = gtk_menu_item_new_with_label (_("Merge")); @@ -368,12 +455,20 @@ tsp_svn_action_create_menu_item (GtkAction *action) gtk_widget_show(subitem); *//* Version control (no parent) */ if (!tsp_action->property.is_parent && tsp_action->property.parent_version_control && (tsp_action->property.directory_version_control || tsp_action->property.file_version_control)) - { - subitem = gtk_menu_item_new_with_label (_("Move")); - g_signal_connect_object (subitem, "activate", G_CALLBACK (tsp_action_move), action, G_CONNECT_AFTER); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); - gtk_widget_show(subitem); - } + { + subaction = g_object_new (GTK_TYPE_ACTION, "name", "tsp::move", "label", _("Move"), +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "gtk-dnd-multiple", +#else + "icon-name", "gtk-dnd-multiple", +#endif + NULL); + g_signal_connect_after (subaction, "activate", G_CALLBACK (tsp_action_move), action); + + subitem = gtk_action_create_menu_item (GTK_ACTION (subaction)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); + gtk_widget_show(subitem); + } /* Merged subitem = gtk_menu_item_new_with_label (_("Delete Properties")); subitem = gtk_menu_item_new_with_label (_("Edit Properties")); @@ -383,67 +478,125 @@ tsp_svn_action_create_menu_item (GtkAction *action) *//* Version control */ if ((tsp_action->property.is_parent && tsp_action->property.parent_version_control) || tsp_action->property.directory_version_control || tsp_action->property.file_version_control) { - subitem = gtk_menu_item_new_with_label (_("Edit Properties")); - g_signal_connect_object (subitem, "activate", G_CALLBACK (tsp_action_properties), action, G_CONNECT_AFTER); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); - gtk_widget_show(subitem); +subaction = g_object_new (GTK_TYPE_ACTION, "name", "tsp::properties", "label", _("Edit Properties"), +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "gtk-edit", +#else + "icon-name", "gtk-edit", +#endif + NULL); + g_signal_connect_after (subaction, "activate", G_CALLBACK (tsp_action_properties), action); + + subitem = gtk_action_create_menu_item (GTK_ACTION (subaction)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); + gtk_widget_show(subitem); } /* Changed subitem = gtk_menu_item_new_with_label (_("Mark Resolved")); */if ((tsp_action->property.is_parent && tsp_action->property.parent_version_control) || tsp_action->property.directory_version_control || tsp_action->property.file_version_control) { - subitem = gtk_menu_item_new_with_label (_("Resolved")); - g_signal_connect_object (subitem, "activate", G_CALLBACK (tsp_action_resolved), action, G_CONNECT_AFTER); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); - gtk_widget_show(subitem); + subaction = g_object_new (GTK_TYPE_ACTION, "name", "tsp::resolved", "label", _("Resolved"), +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "gtk-yes", +#else + "icon-name", "gtk-yes", +#endif + NULL); + g_signal_connect_after (subaction, "activate", G_CALLBACK (tsp_action_resolved), action); + + subitem = gtk_action_create_menu_item (GTK_ACTION (subaction)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); + gtk_widget_show(subitem); }/* *//* Version control (file) */ if (tsp_action->property.file_version_control) { - subitem = gtk_menu_item_new_with_label (_("Resolve")); - g_signal_connect_after (subitem, "activate", G_CALLBACK (tsp_action_unimplemented), "Resolve"); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); - gtk_widget_show(subitem); + subaction = g_object_new (GTK_TYPE_ACTION, "name", "tsp::resolve", "label", _("Resolve"), +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "gtk-yes", +#else + "icon-name", "gtk-yes", +#endif + NULL); + g_signal_connect_after (subaction, "activate", G_CALLBACK (tsp_action_unimplemented), _("Resolve")); + + subitem = gtk_action_create_menu_item (GTK_ACTION (subaction)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); + gtk_widget_show(subitem); } /* Version control (all) */ if ((tsp_action->property.is_parent && tsp_action->property.parent_version_control) || tsp_action->property.directory_version_control || tsp_action->property.file_version_control) { - subitem = gtk_menu_item_new_with_label (_("Revert")); - g_signal_connect_object (subitem, "activate", G_CALLBACK (tsp_action_revert), action, G_CONNECT_AFTER); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); - gtk_widget_show(subitem); + subaction = g_object_new (GTK_TYPE_ACTION, "name", "tsp::revert", "label", _("Revert"), +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "undo", +#else + "icon-name", "undo", +#endif + NULL); + g_signal_connect_after (subaction, "activate", G_CALLBACK (tsp_action_revert), action); + + subitem = gtk_action_create_menu_item (GTK_ACTION (subaction)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); + gtk_widget_show(subitem); } /* Version control (all) */ if ((tsp_action->property.is_parent && tsp_action->property.parent_version_control) || tsp_action->property.directory_version_control || tsp_action->property.file_version_control) { - subitem = gtk_menu_item_new_with_label (_("Status")); - g_signal_connect_object (subitem, "activate", G_CALLBACK (tsp_action_status), action, G_CONNECT_AFTER); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); - gtk_widget_show(subitem); + subaction = g_object_new (GTK_TYPE_ACTION, "name", "tsp::status", "label", _("Status"), +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "gtk-dialog-info", +#else + "icon-name", "gtk-dialog-info", +#endif + NULL); + g_signal_connect_after (subaction, "activate", G_CALLBACK (tsp_action_status), action); + + subitem = gtk_action_create_menu_item (GTK_ACTION (subaction)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); + gtk_widget_show(subitem); } /* Version control (parent) */ if (tsp_action->property.is_parent && tsp_action->property.parent_version_control) { - subitem = gtk_menu_item_new_with_label (_("Switch")); - g_signal_connect_after (subitem, "activate", G_CALLBACK (tsp_action_unimplemented), "Switch"); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); - gtk_widget_show(subitem); + subaction = g_object_new (GTK_TYPE_ACTION, "name", "tsp::switch", "label", _("Switch"), +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "gtk-jump-to", +#else + "icon-name", "gtk-jump-to", +#endif + NULL); + g_signal_connect_after (subaction, "activate", G_CALLBACK (tsp_action_unimplemented), _("Switch")); + + subitem = gtk_action_create_menu_item (GTK_ACTION (subaction)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); + gtk_widget_show(subitem); } /* Version control (all) */ if ((tsp_action->property.is_parent && tsp_action->property.parent_version_control) || tsp_action->property.directory_version_control || tsp_action->property.file_version_control) { - subitem = gtk_menu_item_new_with_label (_("Unlock")); - g_signal_connect_object (subitem, "activate", G_CALLBACK (tsp_action_unlock), action, G_CONNECT_AFTER); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); - gtk_widget_show(subitem); + subaction = g_object_new (GTK_TYPE_ACTION, "name", "tsp::unlock", "label", _("Unlock"), NULL); + g_signal_connect_after (subaction, "activate", G_CALLBACK (tsp_action_unlock), action); + + subitem = gtk_action_create_menu_item (GTK_ACTION (subaction)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); + gtk_widget_show(subitem); } /* Version control (all) */ if ((tsp_action->property.is_parent && tsp_action->property.parent_version_control) || tsp_action->property.directory_version_control || tsp_action->property.file_version_control) { - subitem = gtk_menu_item_new_with_label (_("Update")); - g_signal_connect_object (subitem, "activate", G_CALLBACK (tsp_action_update), action, G_CONNECT_AFTER); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); - gtk_widget_show(subitem); + subaction = g_object_new (GTK_TYPE_ACTION, "name", "tsp::update", "label", _("Update"), +#if !GTK_CHECK_VERSION(2,9,0) + "stock-id", "gtk-refresh", +#else + "icon-name", "gtk-refresh", +#endif + NULL); + g_signal_connect_after (subaction, "activate", G_CALLBACK (tsp_action_update), action); + + subitem = gtk_action_create_menu_item (GTK_ACTION (subaction)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); + gtk_widget_show(subitem); } return item; @@ -451,16 +604,16 @@ tsp_svn_action_create_menu_item (GtkAction *action) -void tsp_action_unimplemented (GtkMenuItem *item, const gchar *action) +void tsp_action_unimplemented (GtkAction *item, const gchar *tsp_action) { - GtkWidget *dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, _("Action %s is unimplemented"), _(action)); + GtkWidget *dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, _("Action %s is unimplemented"), tsp_action); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy(dialog); } -void tsp_action_add (GtkMenuItem *item, TspSvnAction *action) +void tsp_action_add (GtkAction *item, TspSvnAction *tsp_action) { guint size, i; gchar **argv; @@ -470,9 +623,9 @@ void tsp_action_add (GtkMenuItem *item, TspSvnAction *action) gchar *file; gint pid; GError *error = NULL; - GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (action->window)); + GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (tsp_action->window)); - iter = action->files; + iter = tsp_action->files; size = g_list_length (iter); @@ -522,7 +675,7 @@ void tsp_action_add (GtkMenuItem *item, TspSvnAction *action) if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, 0, NULL, NULL, &pid, &error)) { - GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); + GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (tsp_action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s.", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -534,7 +687,7 @@ void tsp_action_add (GtkMenuItem *item, TspSvnAction *action) -void tsp_action_checkout (GtkMenuItem *item, TspSvnAction *action) +void tsp_action_checkout (GtkAction *item, TspSvnAction *tsp_action) { guint size, i; gchar **argv; @@ -544,9 +697,9 @@ void tsp_action_checkout (GtkMenuItem *item, TspSvnAction *action) gchar *file; gint pid; GError *error = NULL; - GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (action->window)); + GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (tsp_action->window)); - iter = action->files; + iter = tsp_action->files; size = g_list_length (iter); @@ -596,7 +749,7 @@ void tsp_action_checkout (GtkMenuItem *item, TspSvnAction *action) if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, 0, NULL, NULL, &pid, &error)) { - GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); + GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (tsp_action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s.", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -608,7 +761,7 @@ void tsp_action_checkout (GtkMenuItem *item, TspSvnAction *action) -void tsp_action_cleanup (GtkMenuItem *item, TspSvnAction *action) +void tsp_action_cleanup (GtkAction *item, TspSvnAction *tsp_action) { guint size, i; gchar **argv; @@ -618,9 +771,9 @@ void tsp_action_cleanup (GtkMenuItem *item, TspSvnAction *action) gchar *file; gint pid; GError *error = NULL; - GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (action->window)); + GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (tsp_action->window)); - iter = action->files; + iter = tsp_action->files; size = g_list_length (iter); @@ -670,7 +823,7 @@ void tsp_action_cleanup (GtkMenuItem *item, TspSvnAction *action) if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, 0, NULL, NULL, &pid, &error)) { - GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); + GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (tsp_action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s.", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -682,7 +835,7 @@ void tsp_action_cleanup (GtkMenuItem *item, TspSvnAction *action) -void tsp_action_commit (GtkMenuItem *item, TspSvnAction *action) +void tsp_action_commit (GtkAction *item, TspSvnAction *tsp_action) { guint size, i; gchar **argv; @@ -692,9 +845,9 @@ void tsp_action_commit (GtkMenuItem *item, TspSvnAction *action) gchar *file; gint pid; GError *error = NULL; - GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (action->window)); + GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (tsp_action->window)); - iter = action->files; + iter = tsp_action->files; size = g_list_length (iter); @@ -744,7 +897,7 @@ void tsp_action_commit (GtkMenuItem *item, TspSvnAction *action) if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, 0, NULL, NULL, &pid, &error)) { - GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); + GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (tsp_action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s.", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -756,7 +909,7 @@ void tsp_action_commit (GtkMenuItem *item, TspSvnAction *action) -void tsp_action_copy (GtkMenuItem *item, TspSvnAction *action) +void tsp_action_copy (GtkAction *item, TspSvnAction *tsp_action) { guint size, i; gchar **argv; @@ -766,9 +919,9 @@ void tsp_action_copy (GtkMenuItem *item, TspSvnAction *action) gchar *file; gint pid; GError *error = NULL; - GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (action->window)); + GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (tsp_action->window)); - iter = action->files; + iter = tsp_action->files; size = g_list_length (iter); @@ -818,7 +971,7 @@ void tsp_action_copy (GtkMenuItem *item, TspSvnAction *action) if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, 0, NULL, NULL, &pid, &error)) { - GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); + GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (tsp_action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s.", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -830,7 +983,7 @@ void tsp_action_copy (GtkMenuItem *item, TspSvnAction *action) -void tsp_action_delete (GtkMenuItem *item, TspSvnAction *action) +void tsp_action_delete (GtkAction *item, TspSvnAction *tsp_action) { guint size, i; gchar **argv; @@ -840,9 +993,9 @@ void tsp_action_delete (GtkMenuItem *item, TspSvnAction *action) gchar *file; gint pid; GError *error = NULL; - GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (action->window)); + GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (tsp_action->window)); - iter = action->files; + iter = tsp_action->files; size = g_list_length (iter); @@ -892,7 +1045,7 @@ void tsp_action_delete (GtkMenuItem *item, TspSvnAction *action) if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, 0, NULL, NULL, &pid, &error)) { - GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); + GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (tsp_action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s.", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -904,7 +1057,7 @@ void tsp_action_delete (GtkMenuItem *item, TspSvnAction *action) -void tsp_action_export (GtkMenuItem *item, TspSvnAction *action) +void tsp_action_export (GtkAction *item, TspSvnAction *tsp_action) { guint size, i; gchar **argv; @@ -914,9 +1067,9 @@ void tsp_action_export (GtkMenuItem *item, TspSvnAction *action) gchar *file; gint pid; GError *error = NULL; - GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (action->window)); + GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (tsp_action->window)); - iter = action->files; + iter = tsp_action->files; size = g_list_length (iter); @@ -966,7 +1119,7 @@ void tsp_action_export (GtkMenuItem *item, TspSvnAction *action) if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, 0, NULL, NULL, &pid, &error)) { - GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); + GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (tsp_action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s.", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -978,7 +1131,7 @@ void tsp_action_export (GtkMenuItem *item, TspSvnAction *action) -void tsp_action_import (GtkMenuItem *item, TspSvnAction *action) +void tsp_action_import (GtkAction *item, TspSvnAction *tsp_action) { guint size, i; gchar **argv; @@ -988,9 +1141,9 @@ void tsp_action_import (GtkMenuItem *item, TspSvnAction *action) gchar *file; gint pid; GError *error = NULL; - GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (action->window)); + GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (tsp_action->window)); - iter = action->files; + iter = tsp_action->files; size = g_list_length (iter); @@ -1040,7 +1193,7 @@ void tsp_action_import (GtkMenuItem *item, TspSvnAction *action) if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, 0, NULL, NULL, &pid, &error)) { - GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); + GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (tsp_action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s.", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -1052,7 +1205,7 @@ void tsp_action_import (GtkMenuItem *item, TspSvnAction *action) -void tsp_action_lock (GtkMenuItem *item, TspSvnAction *action) +void tsp_action_lock (GtkAction *item, TspSvnAction *tsp_action) { guint size, i; gchar **argv; @@ -1062,9 +1215,9 @@ void tsp_action_lock (GtkMenuItem *item, TspSvnAction *action) gchar *file; gint pid; GError *error = NULL; - GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (action->window)); + GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (tsp_action->window)); - iter = action->files; + iter = tsp_action->files; size = g_list_length (iter); @@ -1114,7 +1267,7 @@ void tsp_action_lock (GtkMenuItem *item, TspSvnAction *action) if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, 0, NULL, NULL, &pid, &error)) { - GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); + GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (tsp_action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s.", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -1126,7 +1279,7 @@ void tsp_action_lock (GtkMenuItem *item, TspSvnAction *action) -void tsp_action_log (GtkMenuItem *item, TspSvnAction *action) +void tsp_action_log (GtkAction *item, TspSvnAction *tsp_action) { guint size, i; gchar **argv; @@ -1136,9 +1289,9 @@ void tsp_action_log (GtkMenuItem *item, TspSvnAction *action) gchar *file; gint pid; GError *error = NULL; - GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (action->window)); + GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (tsp_action->window)); - iter = action->files; + iter = tsp_action->files; size = g_list_length (iter); @@ -1188,7 +1341,7 @@ void tsp_action_log (GtkMenuItem *item, TspSvnAction *action) if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, 0, NULL, NULL, &pid, &error)) { - GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); + GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (tsp_action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s.", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -1200,7 +1353,7 @@ void tsp_action_log (GtkMenuItem *item, TspSvnAction *action) -void tsp_action_move (GtkMenuItem *item, TspSvnAction *action) +void tsp_action_move (GtkAction *item, TspSvnAction *tsp_action) { guint size, i; gchar **argv; @@ -1210,9 +1363,9 @@ void tsp_action_move (GtkMenuItem *item, TspSvnAction *action) gchar *file; gint pid; GError *error = NULL; - GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (action->window)); + GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (tsp_action->window)); - iter = action->files; + iter = tsp_action->files; size = g_list_length (iter); @@ -1262,7 +1415,7 @@ void tsp_action_move (GtkMenuItem *item, TspSvnAction *action) if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, 0, NULL, NULL, &pid, &error)) { - GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); + GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (tsp_action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s.", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -1274,7 +1427,7 @@ void tsp_action_move (GtkMenuItem *item, TspSvnAction *action) -void tsp_action_properties (GtkMenuItem *item, TspSvnAction *action) +void tsp_action_properties (GtkAction *item, TspSvnAction *tsp_action) { guint size, i; gchar **argv; @@ -1284,9 +1437,9 @@ void tsp_action_properties (GtkMenuItem *item, TspSvnAction *action) gchar *file; gint pid; GError *error = NULL; - GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (action->window)); + GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (tsp_action->window)); - iter = action->files; + iter = tsp_action->files; size = g_list_length (iter); @@ -1336,7 +1489,7 @@ void tsp_action_properties (GtkMenuItem *item, TspSvnAction *action) if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, 0, NULL, NULL, &pid, &error)) { - GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); + GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (tsp_action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s.", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -1348,7 +1501,7 @@ void tsp_action_properties (GtkMenuItem *item, TspSvnAction *action) -void tsp_action_resolved (GtkMenuItem *item, TspSvnAction *action) +void tsp_action_resolved (GtkAction *item, TspSvnAction *tsp_action) { guint size, i; gchar **argv; @@ -1358,9 +1511,9 @@ void tsp_action_resolved (GtkMenuItem *item, TspSvnAction *action) gchar *file; gint pid; GError *error = NULL; - GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (action->window)); + GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (tsp_action->window)); - iter = action->files; + iter = tsp_action->files; size = g_list_length (iter); @@ -1410,7 +1563,7 @@ void tsp_action_resolved (GtkMenuItem *item, TspSvnAction *action) if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, 0, NULL, NULL, &pid, &error)) { - GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); + GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (tsp_action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s.", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -1422,7 +1575,7 @@ void tsp_action_resolved (GtkMenuItem *item, TspSvnAction *action) -void tsp_action_revert (GtkMenuItem *item, TspSvnAction *action) +void tsp_action_revert (GtkAction *item, TspSvnAction *tsp_action) { guint size, i; gchar **argv; @@ -1432,9 +1585,9 @@ void tsp_action_revert (GtkMenuItem *item, TspSvnAction *action) gchar *file; gint pid; GError *error = NULL; - GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (action->window)); + GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (tsp_action->window)); - iter = action->files; + iter = tsp_action->files; size = g_list_length (iter); @@ -1484,7 +1637,7 @@ void tsp_action_revert (GtkMenuItem *item, TspSvnAction *action) if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, 0, NULL, NULL, &pid, &error)) { - GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); + GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (tsp_action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s.", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -1496,7 +1649,7 @@ void tsp_action_revert (GtkMenuItem *item, TspSvnAction *action) -void tsp_action_status (GtkMenuItem *item, TspSvnAction *action) +void tsp_action_status (GtkAction *item, TspSvnAction *tsp_action) { guint size, i; gchar **argv; @@ -1506,9 +1659,9 @@ void tsp_action_status (GtkMenuItem *item, TspSvnAction *action) gchar *file; gint pid; GError *error = NULL; - GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (action->window)); + GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (tsp_action->window)); - iter = action->files; + iter = tsp_action->files; size = g_list_length (iter); @@ -1558,7 +1711,7 @@ void tsp_action_status (GtkMenuItem *item, TspSvnAction *action) if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, 0, NULL, NULL, &pid, &error)) { - GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); + GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (tsp_action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s.", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -1570,7 +1723,7 @@ void tsp_action_status (GtkMenuItem *item, TspSvnAction *action) -void tsp_action_unlock (GtkMenuItem *item, TspSvnAction *action) +void tsp_action_unlock (GtkAction *item, TspSvnAction *tsp_action) { guint size, i; gchar **argv; @@ -1580,9 +1733,9 @@ void tsp_action_unlock (GtkMenuItem *item, TspSvnAction *action) gchar *file; gint pid; GError *error = NULL; - GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (action->window)); + GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (tsp_action->window)); - iter = action->files; + iter = tsp_action->files; size = g_list_length (iter); @@ -1632,7 +1785,7 @@ void tsp_action_unlock (GtkMenuItem *item, TspSvnAction *action) if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, 0, NULL, NULL, &pid, &error)) { - GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); + GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (tsp_action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s.", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -1644,7 +1797,7 @@ void tsp_action_unlock (GtkMenuItem *item, TspSvnAction *action) -void tsp_action_update (GtkMenuItem *item, TspSvnAction *action) +void tsp_action_update (GtkAction *item, TspSvnAction *tsp_action) { guint size, i; gchar **argv; @@ -1654,9 +1807,9 @@ void tsp_action_update (GtkMenuItem *item, TspSvnAction *action) gchar *file; gint pid; GError *error = NULL; - GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (action->window)); + GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (tsp_action->window)); - iter = action->files; + iter = tsp_action->files; size = g_list_length (iter); @@ -1706,7 +1859,7 @@ void tsp_action_update (GtkMenuItem *item, TspSvnAction *action) if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, 0, NULL, NULL, &pid, &error)) { - GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); + GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (tsp_action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'"); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s.", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); diff --git a/thunar-svn-plugin/tsp-svn-action.h b/thunar-svn-plugin/tsp-svn-action.h index 3ee21b6..04dc9f4 100644 --- a/thunar-svn-plugin/tsp-svn-action.h +++ b/thunar-svn-plugin/tsp-svn-action.h @@ -38,21 +38,21 @@ GType tsp_svn_action_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL; GtkAction *tsp_svn_action_new (const gchar*, const gchar*, - GList *, - GtkWidget *, - gboolean, - gboolean, - gboolean, - gboolean, - gboolean, - gboolean) G_GNUC_MALLOC G_GNUC_INTERNAL; + GList *, + GtkWidget *, + gboolean, + gboolean, + gboolean, + gboolean, + gboolean, + gboolean) G_GNUC_MALLOC G_GNUC_INTERNAL; G_END_DECLS; -void tsp_action_checkout (GtkMenuItem *, TspSvnAction *); -void tsp_action_export (GtkMenuItem *, TspSvnAction *); -void tsp_action_import (GtkMenuItem *, TspSvnAction *); -void tsp_action_unimplemented (GtkMenuItem *, const gchar *); +void tsp_action_checkout (GtkAction *, TspSvnAction *); +void tsp_action_export (GtkAction *, TspSvnAction *); +void tsp_action_import (GtkAction *, TspSvnAction *); +void tsp_action_unimplemented (GtkAction *, const gchar *); #endif /* !__TSP_SVN_ACTION_H__ */