diff --git a/eclipse_projects/Opaque/jni/libs/deps/include/openssl/comp.h b/eclipse_projects/Opaque/jni/libs/deps/include/openssl/comp.h deleted file mode 100644 index 4b405c7d4..000000000 --- a/eclipse_projects/Opaque/jni/libs/deps/include/openssl/comp.h +++ /dev/null @@ -1,80 +0,0 @@ - -#ifndef HEADER_COMP_H -#define HEADER_COMP_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct comp_ctx_st COMP_CTX; - -typedef struct comp_method_st - { - int type; /* NID for compression library */ - const char *name; /* A text string to identify the library */ - int (*init)(COMP_CTX *ctx); - void (*finish)(COMP_CTX *ctx); - int (*compress)(COMP_CTX *ctx, - unsigned char *out, unsigned int olen, - unsigned char *in, unsigned int ilen); - int (*expand)(COMP_CTX *ctx, - unsigned char *out, unsigned int olen, - unsigned char *in, unsigned int ilen); - /* The following two do NOTHING, but are kept for backward compatibility */ - long (*ctrl)(void); - long (*callback_ctrl)(void); - } COMP_METHOD; - -struct comp_ctx_st - { - COMP_METHOD *meth; - unsigned long compress_in; - unsigned long compress_out; - unsigned long expand_in; - unsigned long expand_out; - - CRYPTO_EX_DATA ex_data; - }; - - -COMP_CTX *COMP_CTX_new(COMP_METHOD *meth); -void COMP_CTX_free(COMP_CTX *ctx); -int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen, - unsigned char *in, int ilen); -int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen, - unsigned char *in, int ilen); -COMP_METHOD *COMP_rle(void ); -COMP_METHOD *COMP_zlib(void ); -void COMP_zlib_cleanup(void); - -#ifdef HEADER_BIO_H -#ifdef ZLIB -BIO_METHOD *BIO_f_zlib(void); -#endif -#endif - -/* BEGIN ERROR CODES */ -/* The following lines are auto generated by the script mkerr.pl. Any changes - * made after this point may be overwritten when the script is next run. - */ -void ERR_load_COMP_strings(void); - -/* Error codes for the COMP functions. */ - -/* Function codes. */ -#define COMP_F_BIO_ZLIB_FLUSH 99 -#define COMP_F_BIO_ZLIB_NEW 100 -#define COMP_F_BIO_ZLIB_READ 101 -#define COMP_F_BIO_ZLIB_WRITE 102 - -/* Reason codes. */ -#define COMP_R_ZLIB_DEFLATE_ERROR 99 -#define COMP_R_ZLIB_INFLATE_ERROR 100 -#define COMP_R_ZLIB_NOT_SUPPORTED 101 - -#ifdef __cplusplus -} -#endif -#endif diff --git a/eclipse_projects/ZoomerWithKeys/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png b/eclipse_projects/ZoomerWithKeys/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png new file mode 100644 index 000000000..e3ada9726 Binary files /dev/null and b/eclipse_projects/ZoomerWithKeys/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png differ diff --git a/eclipse_projects/ZoomerWithKeys/res/drawable-ldpi/ic_menu_moreoverflow_normal_holo_light.png b/eclipse_projects/ZoomerWithKeys/res/drawable-ldpi/ic_menu_moreoverflow_normal_holo_light.png new file mode 100644 index 000000000..db6b0810b Binary files /dev/null and b/eclipse_projects/ZoomerWithKeys/res/drawable-ldpi/ic_menu_moreoverflow_normal_holo_light.png differ diff --git a/eclipse_projects/ZoomerWithKeys/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png b/eclipse_projects/ZoomerWithKeys/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png new file mode 100644 index 000000000..f1cba845b Binary files /dev/null and b/eclipse_projects/ZoomerWithKeys/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png differ diff --git a/eclipse_projects/ZoomerWithKeys/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_light.png b/eclipse_projects/ZoomerWithKeys/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_light.png new file mode 100644 index 000000000..4bbf600ba Binary files /dev/null and b/eclipse_projects/ZoomerWithKeys/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_light.png differ diff --git a/eclipse_projects/ZoomerWithKeys/res/drawable/ic_menu_moreoverflow_normal_holo_light.png b/eclipse_projects/ZoomerWithKeys/res/drawable/ic_menu_moreoverflow_normal_holo_light.png new file mode 100644 index 000000000..f1cba845b Binary files /dev/null and b/eclipse_projects/ZoomerWithKeys/res/drawable/ic_menu_moreoverflow_normal_holo_light.png differ diff --git a/eclipse_projects/ZoomerWithKeys/res/layout/zoom_controls.xml b/eclipse_projects/ZoomerWithKeys/res/layout/zoom_controls.xml index 4987fd293..b0b84f841 100644 --- a/eclipse_projects/ZoomerWithKeys/res/layout/zoom_controls.xml +++ b/eclipse_projects/ZoomerWithKeys/res/layout/zoom_controls.xml @@ -29,6 +29,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" /> + + android:versionCode="3780" android:versionName="v3.7.8"> diff --git a/eclipse_projects/bVNC/src/com/iiordanov/bVNC/RemoteCanvasActivity.java b/eclipse_projects/bVNC/src/com/iiordanov/bVNC/RemoteCanvasActivity.java index ae19ff635..e251a0d4d 100644 --- a/eclipse_projects/bVNC/src/com/iiordanov/bVNC/RemoteCanvasActivity.java +++ b/eclipse_projects/bVNC/src/com/iiordanov/bVNC/RemoteCanvasActivity.java @@ -308,18 +308,20 @@ public void onGlobalLayout() { zoomer.hide(); zoomer.setOnZoomKeyboardClickListener(new View.OnClickListener() { - - /* - * (non-Javadoc) - * - * @see android.view.View.OnClickListener#onClick(android.view.View) - */ @Override public void onClick(View v) { InputMethodManager inputMgr = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE); inputMgr.toggleSoftInput(0, 0); } + }); + + zoomer.setOnShowMenuClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + RemoteCanvasActivity.this.openOptionsMenu(); + } + }); panner = new Panner(this, canvas.handler);