Author: dzzinstant
Date: Sun Jun  1 23:15:34 2014
New Revision: 10

URL: http://svn.gna.org/viewcvs/pidgin-zrtp?rev=10&view=rev
Log:
some cleanup

Modified:
    trunk/patches/farsight2-zrtpconf.diff
    trunk/patches/farsight2.diff
    trunk/patches/farstream-0.1.2.diff
    trunk/patches/gstzrtp-old_version.diff
    trunk/patches/gstzrtp.diff
    trunk/src/pidgin-plugin/simplezrtp/gtk-encrypt.c

Modified: trunk/patches/farsight2-zrtpconf.diff
URL: 
http://svn.gna.org/viewcvs/pidgin-zrtp/trunk/patches/farsight2-zrtpconf.diff?rev=10&r1=9&r2=10&view=diff
==============================================================================
--- trunk/patches/farsight2-zrtpconf.diff       (original)
+++ trunk/patches/farsight2-zrtpconf.diff       Sun Jun  1 23:15:34 2014
@@ -1,6 +1,6 @@
 diff -r 446a55e3ac6a gst/fsrtpconference/Makefile.am
---- a/gst/fsrtpconference/Makefile.am  Fri Apr 19 00:17:14 2013 +0200
-+++ b/gst/fsrtpconference/Makefile.am  Mon May 26 14:32:43 2014 +0200
+--- a/gst/fsrtpconference/Makefile.am
++++ b/gst/fsrtpconference/Makefile.am
 @@ -21,7 +21,9 @@
        fs-rtp-keyunit-manager.c \
        fs-rtp-tfrc.c \

Modified: trunk/patches/farsight2.diff
URL: 
http://svn.gna.org/viewcvs/pidgin-zrtp/trunk/patches/farsight2.diff?rev=10&r1=9&r2=10&view=diff
==============================================================================
--- trunk/patches/farsight2.diff        (original)
+++ trunk/patches/farsight2.diff        Sun Jun  1 23:15:34 2014
@@ -1,6 +1,6 @@
 diff -r 446a55e3ac6a -r 95501b570476 configure.ac
---- a/configure.ac     Fri Apr 19 00:17:14 2013 +0200
-+++ b/configure.ac     Fri May 23 03:31:30 2014 +0200
+--- a/configure.ac
++++ b/configure.ac
 @@ -384,6 +384,8 @@
         [true])
  fi
@@ -11,8 +11,8 @@
  
  AC_CONFIG_FILES(
 diff -r 446a55e3ac6a -r 95501b570476 gst/fsrtpconference/fs-rtp-conference.c
---- a/gst/fsrtpconference/fs-rtp-conference.c  Fri Apr 19 00:17:14 2013 +0200
-+++ b/gst/fsrtpconference/fs-rtp-conference.c  Fri May 23 03:31:30 2014 +0200
+--- a/gst/fsrtpconference/fs-rtp-conference.c
++++ b/gst/fsrtpconference/fs-rtp-conference.c
 @@ -49,6 +49,10 @@
  #include "fs-rtp-stream.h"
  #include "fs-rtp-participant.h"
@@ -102,8 +102,8 @@
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
 diff -r 446a55e3ac6a -r 95501b570476 gst/fsrtpconference/fs-rtp-session.c
---- a/gst/fsrtpconference/fs-rtp-session.c     Fri Apr 19 00:17:14 2013 +0200
-+++ b/gst/fsrtpconference/fs-rtp-session.c     Fri May 23 03:31:30 2014 +0200
+--- a/gst/fsrtpconference/fs-rtp-session.c
++++ b/gst/fsrtpconference/fs-rtp-session.c
 @@ -79,6 +79,11 @@
  #include "fs-rtp-codec-specific.h"
  #include "fs-rtp-tfrc.h"

Modified: trunk/patches/farstream-0.1.2.diff
URL: 
http://svn.gna.org/viewcvs/pidgin-zrtp/trunk/patches/farstream-0.1.2.diff?rev=10&r1=9&r2=10&view=diff
==============================================================================
--- trunk/patches/farstream-0.1.2.diff  (original)
+++ trunk/patches/farstream-0.1.2.diff  Sun Jun  1 23:15:34 2014
@@ -1,6 +1,6 @@
 diff -r bb8bb4f75f07 -r 34e1e7a0c72e configure.ac
---- a/configure.ac     Sun Jun 01 00:17:00 2014 +0200
-+++ b/configure.ac     Sun Jun 01 00:18:29 2014 +0200
+--- a/configure.ac
++++ b/configure.ac
 @@ -386,6 +386,8 @@
     AC_ERROR([Requested GUPnP IGD, but it is not available])
  fi
@@ -11,8 +11,8 @@
  
  AC_CONFIG_FILES(
 diff -r bb8bb4f75f07 -r 34e1e7a0c72e gst/fsrtpconference/fs-rtp-conference.c
---- a/gst/fsrtpconference/fs-rtp-conference.c  Sun Jun 01 00:17:00 2014 +0200
-+++ b/gst/fsrtpconference/fs-rtp-conference.c  Sun Jun 01 00:18:29 2014 +0200
+--- a/gst/fsrtpconference/fs-rtp-conference.c
++++ b/gst/fsrtpconference/fs-rtp-conference.c
 @@ -49,6 +49,10 @@
  #include "fs-rtp-stream.h"
  #include "fs-rtp-participant.h"
@@ -90,8 +90,8 @@
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
 diff -r bb8bb4f75f07 -r 34e1e7a0c72e gst/fsrtpconference/fs-rtp-session.c
---- a/gst/fsrtpconference/fs-rtp-session.c     Sun Jun 01 00:17:00 2014 +0200
-+++ b/gst/fsrtpconference/fs-rtp-session.c     Sun Jun 01 00:18:29 2014 +0200
+--- a/gst/fsrtpconference/fs-rtp-session.c
++++ b/gst/fsrtpconference/fs-rtp-session.c
 @@ -79,6 +79,11 @@
  #include "fs-rtp-codec-specific.h"
  #include "fs-rtp-tfrc.h"

Modified: trunk/patches/gstzrtp-old_version.diff
URL: 
http://svn.gna.org/viewcvs/pidgin-zrtp/trunk/patches/gstzrtp-old_version.diff?rev=10&r1=9&r2=10&view=diff
==============================================================================
--- trunk/patches/gstzrtp-old_version.diff      (original)
+++ trunk/patches/gstzrtp-old_version.diff      Sun Jun  1 23:15:34 2014
@@ -1,5 +1,5 @@
---- gstzrtp-master/getzrtp.sh  2014-05-26 22:02:22.070734152 +0200
-+++ getzrtp.sh 2014-05-26 22:01:51.330733329 +0200
+--- gstzrtp-master/getzrtp.sh
++++ getzrtp.sh
 @@ -1,6 +1,7 @@
  #!/bin/sh
  if ! test -d zrtp; then

Modified: trunk/patches/gstzrtp.diff
URL: 
http://svn.gna.org/viewcvs/pidgin-zrtp/trunk/patches/gstzrtp.diff?rev=10&r1=9&r2=10&view=diff
==============================================================================
--- trunk/patches/gstzrtp.diff  (original)
+++ trunk/patches/gstzrtp.diff  Sun Jun  1 23:15:34 2014
@@ -1,6 +1,6 @@
 diff -r ba9d3e83d723 -r 6c6631c478d6 src/gstzrtpfilter.c
---- a/src/gstzrtpfilter.c      Mon May 26 12:49:52 2014 +0200
-+++ b/src/gstzrtpfilter.c      Mon May 26 12:55:12 2014 +0200
+--- a/src/gstzrtpfilter.c
++++ b/src/gstzrtpfilter.c
 @@ -130,6 +130,7 @@
      PROP_MULTI_PARAM,
      PROP_IS_MULTI,

Modified: trunk/src/pidgin-plugin/simplezrtp/gtk-encrypt.c
URL: 
http://svn.gna.org/viewcvs/pidgin-zrtp/trunk/src/pidgin-plugin/simplezrtp/gtk-encrypt.c?rev=10&r1=9&r2=10&view=diff
==============================================================================
--- trunk/src/pidgin-plugin/simplezrtp/gtk-encrypt.c    (original)
+++ trunk/src/pidgin-plugin/simplezrtp/gtk-encrypt.c    Sun Jun  1 23:15:34 2014
@@ -261,58 +261,58 @@
 }
 
 static GtkWidget *
-pidgin_encrypt_call_add_controlbox(PidginEncryptCall *obj)
+pidgin_encrypt_call_add_controlbox(PidginEncryptCall *call)
 {
        GtkWidget *button;
        GtkWidget *labelbox;
 
-       g_return_val_if_fail(obj, NULL);
-
-       obj->controlbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-
-       button = gtk_label_new(obj->participant);
-       gtk_box_pack_start(GTK_BOX(obj->controlbox), button, FALSE, FALSE, 0);
+       g_return_val_if_fail(call, NULL);
+
+       call->controlbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+
+       button = gtk_label_new(call->participant);
+       gtk_box_pack_start(GTK_BOX(call->controlbox), button, FALSE, FALSE, 0);
 
        /* Icon to indicate authentication state */
-       obj->image = gtk_image_new();
-       obj->label = gtk_label_new(NULL);
+       call->image = gtk_image_new();
+       call->label = gtk_label_new(NULL);
        labelbox = gtk_hbox_new(FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(labelbox), obj->image, FALSE, FALSE, 3);
-       gtk_box_pack_start(GTK_BOX(labelbox), obj->label, FALSE, FALSE, 3);
-
-       obj->authimg = gtk_toggle_button_new();
-       gtk_container_add(GTK_CONTAINER(obj->authimg), labelbox);
-
-       gtk_button_set_relief(GTK_BUTTON(obj->authimg), GTK_RELIEF_NONE);
-       gtk_box_pack_start(GTK_BOX(obj->controlbox), obj->authimg, TRUE, FALSE, 
0);
+       gtk_box_pack_start(GTK_BOX(labelbox), call->image, FALSE, FALSE, 3);
+       gtk_box_pack_start(GTK_BOX(labelbox), call->label, FALSE, FALSE, 3);
+
+       call->authimg = gtk_toggle_button_new();
+       gtk_container_add(GTK_CONTAINER(call->authimg), labelbox);
+
+       gtk_button_set_relief(GTK_BUTTON(call->authimg), GTK_RELIEF_NONE);
+       gtk_box_pack_start(GTK_BOX(call->controlbox), call->authimg, TRUE, 
FALSE, 0);
 
        purple_debug_info(PLUGIN_ID, "_add controlbox(): authimg=%p(%s) 
image=%p(%s) label=%p(%s)\n", 
-                       obj->authimg, gtk_widget_get_name(obj->authimg),
-                       obj->image, gtk_widget_get_name(obj->image),
-                       obj->label, gtk_widget_get_name(obj->label));
+                       call->authimg, gtk_widget_get_name(call->authimg),
+                       call->image, gtk_widget_get_name(call->image),
+                       call->label, gtk_widget_get_name(call->label));
 
        /*
         * Auth box, may be hidden when authentication is not requested
         */     
-       obj->authbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-       gtk_box_pack_start(GTK_BOX(obj->controlbox), 
-                       obj->authbox, TRUE, TRUE, 6);
+       call->authbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+       gtk_box_pack_start(GTK_BOX(call->controlbox), 
+                       call->authbox, TRUE, TRUE, 6);
        /* SAS text box */
-       obj->msgwidget = gtk_label_new(" (no SAS)  ");
-       gtk_box_pack_end(GTK_BOX(obj->authbox), 
-                       obj->msgwidget, FALSE, FALSE, 2);
+       call->msgwidget = gtk_label_new(" (no SAS)  ");
+       gtk_box_pack_end(GTK_BOX(call->authbox), 
+                       call->msgwidget, FALSE, FALSE, 2);
        /* ZRTP authenticate button */
-       obj->authbutton = gtk_check_button_new_with_mnemonic(_("_Confirm"));
-       gtk_box_pack_end(GTK_BOX(obj->authbox), 
-                       obj->authbutton, FALSE, FALSE, 2);
-
-       g_signal_connect(G_OBJECT(obj->authimg), "clicked",
-                       G_CALLBACK(authimg_clicked_cb), obj);
-
-       g_signal_connect(G_OBJECT(obj->authbutton), "toggled",
-                       G_CALLBACK(authbutton_toggled_cb), obj);
-
-       return obj->controlbox;
+       call->authbutton = gtk_check_button_new_with_mnemonic(_("_Confirm"));
+       gtk_box_pack_end(GTK_BOX(call->authbox), 
+                       call->authbutton, FALSE, FALSE, 2);
+
+       g_signal_connect(G_OBJECT(call->authimg), "clicked",
+                       G_CALLBACK(authimg_clicked_cb), call);
+
+       g_signal_connect(G_OBJECT(call->authbutton), "toggled",
+                       G_CALLBACK(authbutton_toggled_cb), call);
+
+       return call->controlbox;
 }
 
 /* Creates a new authentication box for this participant. */
@@ -417,10 +417,10 @@
 
 /* ** */
 static void
-authbutton_toggled_cb(GtkToggleButton *toggle, PidginEncryptCall *obj)
-{
-        PidginEncrypt *gtkencrypt = obj->gtkencrypt;
-        const gchar *participant = obj->participant;
+authbutton_toggled_cb(GtkToggleButton *toggle, PidginEncryptCall *call)
+{
+        PidginEncrypt *gtkencrypt = call->gtkencrypt;
+        const gchar *participant = call->participant;
         PidginEncryptPrivate *priv;
         PurpleEncrypt *encrypt;
 
@@ -433,7 +433,7 @@
 }
 
 static void
-authimg_clicked_cb(GtkToggleButton *authimg, PidginEncryptCall *obj)
+authimg_clicked_cb(GtkToggleButton *authimg, PidginEncryptCall *call)
 {
        gboolean show_authbox = gtk_toggle_button_get_active(authimg);
 


_______________________________________________
Pidgin-zrtp-commits mailing list
Pidgin-zrtp-commits@gna.org
https://mail.gna.org/listinfo/pidgin-zrtp-commits

Reply via email to