diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2011-09-25 21:19:45 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2011-09-25 21:19:45 +0000 |
| commit | 420acb2fba82e515b54f0e2da4a4aa8054e7e705 (patch) | |
| tree | 5ba23b8070f84746cfba469999a1d86e47adea7e /gtk/conversations_jxta.c | |
| parent | c3d02e4b57659e16beb9230257fc159c8bc5efbe (diff) | |
We now always build with MAIN_MENU_USE_UIMANAGER, so remove all code using
the old ways except the proto_help.c file, which is kept for now in case someone
is willing to reimplement the help menus using non-deprecated methods.
svn path=/trunk/; revision=39137
Diffstat (limited to 'gtk/conversations_jxta.c')
| -rw-r--r-- | gtk/conversations_jxta.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/gtk/conversations_jxta.c b/gtk/conversations_jxta.c index 9e734435d9..82cd28b2f5 100644 --- a/gtk/conversations_jxta.c +++ b/gtk/conversations_jxta.c @@ -79,29 +79,15 @@ jxta_conversation_init(const char *optarg, void* userdata _U_) } -#ifdef MAIN_MENU_USE_UIMANAGER void jxta_conversation_cb(GtkAction *action _U_, gpointer user_data _U_) { jxta_conversation_init("conv,jxta",NULL); } -#else -static void -jxta_conversation_cb(GtkWidget *w _U_, gpointer d _U_) -{ - jxta_conversation_init("conv,jxta",NULL); -} -#endif void register_tap_listener_jxta_conversation(void) { register_stat_cmd_arg("conv,jxta", jxta_conversation_init,NULL); - -#ifdef MAIN_MENU_USE_UIMANAGER -#else - register_stat_menu_item("JXTA", REGISTER_STAT_GROUP_CONVERSATION_LIST, - jxta_conversation_cb, NULL, NULL, NULL); -#endif register_conversation_table(TRUE, "JXTA", "jxta", NULL /*filter*/, jxta_conversation_packet); } |