diff -Nru cryptkeeper-0.9.5/debian/changelog cryptkeeper-0.9.5/debian/changelog --- cryptkeeper-0.9.5/debian/changelog 2013-11-04 22:18:30.000000000 +0400 +++ cryptkeeper-0.9.5/debian/changelog 2015-02-11 16:17:10.000000000 +0300 @@ -1,3 +1,11 @@ +cryptkeeper (0.9.5-5.1ubuntu3.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * debian/patches/add_support_for_appindicator.patch: + - removed unused and uninitialized widget (fixes GTK critical warning). + + -- Vlad Orlov Wed, 11 Feb 2015 16:16:29 +0300 + cryptkeeper (0.9.5-5.1ubuntu3) trusty; urgency=low * No change rebuild. It should fix some random segfaults. diff -Nru cryptkeeper-0.9.5/debian/patches/add_support_for_appindicator.patch cryptkeeper-0.9.5/debian/patches/add_support_for_appindicator.patch --- cryptkeeper-0.9.5/debian/patches/add_support_for_appindicator.patch 2013-05-13 15:38:32.000000000 +0400 +++ cryptkeeper-0.9.5/debian/patches/add_support_for_appindicator.patch 2015-02-11 16:17:39.000000000 +0300 @@ -9,10 +9,10 @@ src/main.cpp | 625 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 651 insertions(+), 6 deletions(-) -diff --git a/configure.ac b/configure.ac -index 20762d5..b7fac14 100644 ---- a/configure.ac -+++ b/configure.ac +Index: cryptkeeper-0.9.5/configure.ac +=================================================================== +--- cryptkeeper-0.9.5.orig/configure.ac ++++ cryptkeeper-0.9.5/configure.ac @@ -17,12 +17,36 @@ AM_GNU_GETTEXT_VERSION([0.16]) #PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1, CFLAGS="$CFLAGS -DUSE_GNOME_KEYRING", echo "Gnome Keyring support disabled") PKG_CHECK_MODULES(DEP, gtk+-2.0 >= 2.8 gconf-2.0) @@ -52,10 +52,10 @@ #AC_PROG_LIBTOOL -diff --git a/src/ImportStashWizard.h b/src/ImportStashWizard.h -index 6d69dfb..84f540c 100644 ---- a/src/ImportStashWizard.h -+++ b/src/ImportStashWizard.h +Index: cryptkeeper-0.9.5/src/ImportStashWizard.h +=================================================================== +--- cryptkeeper-0.9.5.orig/src/ImportStashWizard.h ++++ cryptkeeper-0.9.5/src/ImportStashWizard.h @@ -7,12 +7,12 @@ class ImportStashWizard { void Hide (); void Restart (); @@ -71,10 +71,10 @@ enum WizardStage { WIZ_START, WIZ_PASSWD, -diff --git a/src/main.cpp b/src/main.cpp -index 878e1b0..ec2bbc2 100644 ---- a/src/main.cpp -+++ b/src/main.cpp +Index: cryptkeeper-0.9.5/src/main.cpp +=================================================================== +--- cryptkeeper-0.9.5.orig/src/main.cpp ++++ cryptkeeper-0.9.5/src/main.cpp @@ -43,6 +43,9 @@ # include "gtkstatusicon.h" #endif @@ -85,7 +85,7 @@ class CryptPoint { private: -@@ -65,13 +68,59 @@ class CryptPoint { +@@ -65,13 +68,58 @@ class CryptPoint { void SetIsAvailable (bool b) { isAvailable = b; } }; @@ -108,7 +108,6 @@ + GtkWidget *m_button_password; + GtkWidget *m_button_cancel; + GtkWidget *m_button_delete; -+ GtkWidget *m_button_reset; + GtkWidget *m_label; + GtkTreeSelection *m_selection; + GtkTreeModel *m_model; @@ -145,7 +144,7 @@ char *config_filemanager; int config_idletime; bool config_keep_mountpoints; -@@ -300,6 +349,9 @@ static void on_mount_check_item_toggled (GtkCheckMenuItem *mi, int idx) +@@ -300,6 +348,9 @@ static void on_mount_check_item_toggled } } } @@ -155,7 +154,7 @@ } static void on_import_stash_clicked (GtkWidget *blah) -@@ -312,7 +364,7 @@ static void on_create_new_stash_clicked (GtkWidget *blah) +@@ -312,7 +363,7 @@ static void on_create_new_stash_clicked create_stash_wizard->Show (); } @@ -164,7 +163,7 @@ static bool on_dostuff_menu_destroy () { -@@ -344,6 +396,30 @@ gboolean on_click_stash_info (GtkMenuItem *mi, gpointer data) +@@ -344,6 +395,30 @@ gboolean on_click_stash_info (GtkMenuIte return FALSE; } @@ -195,7 +194,7 @@ gboolean on_click_change_stash_password (GtkMenuItem *mi, gpointer data) { -@@ -401,6 +477,60 @@ gboolean on_click_delete_stash (GtkMenuItem *mi, gpointer data) +@@ -401,6 +476,60 @@ gboolean on_click_delete_stash (GtkMenuI return FALSE; } @@ -256,7 +255,7 @@ gboolean on_button_release (GtkWidget *widget, GdkEventButton *event, gpointer data) { int item_no = GPOINTER_TO_INT (data); -@@ -440,6 +570,15 @@ static void open_config_dialog () +@@ -440,6 +569,15 @@ static void open_config_dialog () config_dialog->Show (); } @@ -272,7 +271,7 @@ static void open_about_dialog () { GtkWidget *dialog = gtk_about_dialog_new (); -@@ -455,6 +594,7 @@ static void open_about_dialog () +@@ -455,6 +593,7 @@ static void open_about_dialog () gtk_widget_destroy (dialog); } @@ -280,7 +279,7 @@ static void sico_right_button_activated () { GtkWidget *menu = gtk_menu_new (); -@@ -476,7 +616,100 @@ static void sico_right_button_activated () +@@ -476,7 +615,100 @@ static void sico_right_button_activated gtk_menu_popup (GTK_MENU (menu), NULL, NULL, gtk_status_icon_position_menu, sico, 0, gtk_get_current_event_time ()); } @@ -381,7 +380,7 @@ static void sico_activated (GtkWidget *data) { stashes_popup_menu = gtk_menu_new (); -@@ -544,6 +777,7 @@ static void sico_activated (GtkWidget *data) +@@ -544,6 +776,7 @@ static void sico_activated (GtkWidget *d gtk_menu_popup (GTK_MENU (stashes_popup_menu), NULL, NULL, gtk_status_icon_position_menu, sico, 0, gtk_get_current_event_time ()); } @@ -389,7 +388,7 @@ #define CONF_DIR "/apps/cryptkeeper" #define CONF_PATH_FILEMANAGER "/apps/cryptkeeper/filemanager" -@@ -657,6 +891,376 @@ static void on_change_conf_stashes (GConfClient *client, guint cnxn_id, GConfEnt +@@ -657,6 +890,375 @@ static void on_change_conf_stashes (GCon read_config (); } @@ -651,7 +650,6 @@ + gtk_box_pack_start (GTK_BOX (m_sidebuttonbox), m_button_information, FALSE, FALSE, UI_SPACING); + gtk_box_pack_start (GTK_BOX (m_sidebuttonbox), m_button_password, FALSE, FALSE, UI_SPACING); + gtk_box_pack_start (GTK_BOX (m_sidebuttonbox), m_button_delete, FALSE, FALSE, UI_SPACING); -+ gtk_box_pack_start (GTK_BOX (m_sidebuttonbox), m_button_reset, FALSE, FALSE, UI_SPACING); + gtk_button_box_set_layout ((GtkButtonBox *) m_sidebuttonbox, GTK_BUTTONBOX_START); + gtk_box_pack_start (GTK_BOX (m_hbox),m_sidebuttonbox, FALSE, FALSE, UI_SPACING); + @@ -766,7 +764,7 @@ int main (int argc, char *argv[]) { setlocale (LC_ALL, ""); -@@ -680,15 +1284,32 @@ int main (int argc, char *argv[]) +@@ -680,15 +1282,32 @@ int main (int argc, char *argv[]) for (it = cryptPoints.begin (); it != cryptPoints.end (); ++it) { if (!config_keep_mountpoints) rmdir ((*it).GetMountDir ()); } @@ -781,10 +779,10 @@ + indicator = app_indicator_new ("cryptkeeper", + GTK_STOCK_DIALOG_AUTHENTICATION, + APP_INDICATOR_CATEGORY_APPLICATION_STATUS); -+ + + app_indicator_set_status (indicator, APP_INDICATOR_STATUS_ACTIVE); + app_indicator_set_attention_icon (indicator, GTK_STOCK_DIALOG_AUTHENTICATION); - ++ + refresh_menu(); +#endif create_stash_wizard = new CreateStashWizard (); @@ -800,6 +798,3 @@ gtk_main (); --- -1.7.9.5 -